msb-public
/
svelte
mirror of https://github.com/sveltejs/svelte
1
0
Code Issues Projects Releases Wiki Activity

code organisation

Browse Source
pull/3420/head
Richard Harris 5 years ago
parent fb5179b0f3
commit 3c5d46dc0b
6 changed files with 138 additions and 127 deletions
Show Stats Download Patch File Download Diff File

6
site/src/routes/auth/_config.js
Unescape View File

@ -0,0 +1,6 @@
export const oauth = 'https://github.com/login/oauth';
export const baseurl = process.env.BASEURL;
export const secure = baseurl.startsWith('https:');
export const client_id = process.env.GITHUB_CLIENT_ID;
export const client_secret = process.env.GITHUB_CLIENT_SECRET;

68
site/src/routes/auth/callback.js
Unescape View File

@ -0,0 +1,68 @@
import send from '@polka/send';
import devalue from 'devalue';
import * as cookie from 'cookie';
import * as httpie from 'httpie';
import { parse, stringify } from 'querystring';
import { find, query } from '../../utils/db.js';
import { to_user } from '../../utils/auth';
import { oauth, secure, client_id, client_secret } from './_config.js';
export async function get(req, res) {
try {
// Trade "code" for "access_token"
const r1 = await httpie.post(`${oauth}/access_token?` + stringify({
code: req.query.code,
client_id,
client_secret,
}));
// Now fetch User details
const { access_token } = parse(r1.data);
const r2 = await httpie.get('https://api.github.com/user', {
headers: {
'User-Agent': 'svelte.dev',
Authorization: `token ${access_token}`
}
});
const { id: uid, name, avatar_url, login } = r2.data;
// Upsert `users` table
const [user] = await query(`
insert into users(uid, name, username, avatar, github_token)
values ($1, $2, $3, $4, $5) on conflict (uid) do update
set (name, username, avatar, github_token, updated_at) = ($2, $3, $4, $5, now())
returning *
`, [uid, name, login, avatar_url, access_token]);
const session = await find(`
insert into sessions(user_id)
values ($1)
returning *
`, [user.id]);
res.writeHead(200, {
'Set-Cookie': cookie.serialize('sid', session.uid, {
maxAge: 31536000,
path: '/',
httpOnly: true,
secure
}),
'Content-Type': 'text/html; charset=utf-8'
});
res.end(`
<script>
window.opener.postMessage({
user: ${devalue(to_user(user))}
}, window.location.origin);
</script>
`);
} catch (err) {
console.error('GET /auth/callback', err);
send(res, 500, err.data, {
'Content-Type': err.headers['content-type'],
'Content-Length': err.headers['content-length']
});
}
}

27
site/src/routes/auth/login.js
Unescape View File

@ -0,0 +1,27 @@
import send from '@polka/send';
import { stringify } from 'querystring';
import { oauth, baseurl, client_id } from './_config.js';
export const get = client_id
? (req, res) => {
const Location = `${oauth}/authorize?` + stringify({
scope: 'read:user',
client_id,
redirect_uri: `${baseurl}/auth/callback`,
});
send(res, 302, Location, { Location });
}
: (req, res) => {
send(res, 500, `
<body style="font-family: sans-serif; background: rgb(255,215,215); border: 2px solid red; margin: 0; padding: 1em;">
<h1>Missing .env file</h1>
<p>In order to use GitHub authentication, you will need to <a target="_blank" href="https://github.com/settings/developers">register an OAuth application</a> and create a local .env file:</p>
<pre>GITHUB_CLIENT_ID=[YOUR_APP_ID]\nGITHUB_CLIENT_SECRET=[YOUR_APP_SECRET]\nBASEURL=http://localhost:3000</pre>
<p>The <code>BASEURL</code> variable should match the callback URL specified for your app.</p>
<p>See also <a target="_blank" href="https://github.com/sveltejs/svelte/tree/master/site#repl-github-integration">here</a></p>
</body>
`, {
'Content-Type': 'text/html; charset=utf-8'
});
};

19
site/src/routes/auth/logout.js
Unescape View File

@ -0,0 +1,19 @@
import send from '@polka/send';
import * as cookie from 'cookie';
import { query } from '../../utils/db.js';
import { secure } from './_config.js';
export async function get(req, res) {
await query(`
delete from sessions where uid = $1
`, [req.cookies.sid]);
send(res, 200, '', {
'Set-Cookie': cookie.serialize('sid', '', {
maxAge: -1,
path: '/',
httpOnly: true,
secure
})
});
}

139
site/src/server.js
Unescape View File

@ -1,21 +1,12 @@
import polka from 'polka'; import polka from 'polka';
import send from '@polka/send'; import send from '@polka/send';
import devalue from 'devalue';
import { get, post } from 'httpie';
import sirv from 'sirv'; import sirv from 'sirv';
import * as sapper from '@sapper/server'; import * as sapper from '@sapper/server';
import * as cookie from 'cookie'; import * as cookie from 'cookie';
import { parse, stringify } from 'querystring'; import { find } from './utils/db';
import { find, query } from './utils/db'; import { to_user } from './utils/auth';
const { const { PORT = 3000 } = process.env;
PORT = 3000,
GITHUB_CLIENT_ID,
GITHUB_CLIENT_SECRET,
BASEURL
} = process.env;
const OAuth = 'https://github.com/login/oauth';
const app = polka({ const app = polka({
onError: (err, req, res) => { onError: (err, req, res) => {
@ -25,132 +16,25 @@ const app = polka({
} }
}); });
const to_user = obj => ({ app.use(
uid: obj.uid, // authenticate user
username: obj.username, async (req, res, next) => {
name: obj.name,
avatar: obj.avatar
});
if (GITHUB_CLIENT_ID) {
app.use(async (req, res, next) => {
if (req.headers.cookie) { if (req.headers.cookie) {
const cookies = cookie.parse(req.headers.cookie); req.cookies = cookie.parse(req.headers.cookie);
if (cookies.sid) { if (req.cookies.sid) {
if (req.url === '/auth/logout') {
await query(`
delete from sessions where uid = $1
`, [cookies.sid]);
send(res, 200);
return;
}
req.user = await find(` req.user = await find(`
select users.id, users.uid, users.username, users.name, users.avatar select users.id, users.uid, users.username, users.name, users.avatar
from sessions from sessions
left join users on sessions.user_id = users.id left join users on sessions.user_id = users.id
where sessions.uid = $1 and expiry > now() where sessions.uid = $1 and expiry > now()
`, [cookies.sid]); `, [req.cookies.sid]);
} }
} }
next(); next();
}); },
app.get('/auth/login', (req, res) => {
try {
const Location = `${OAuth}/authorize?` + stringify({
scope: 'read:user',
client_id: GITHUB_CLIENT_ID,
redirect_uri: `${BASEURL}/auth/callback`,
});
send(res, 302, Location, { Location });
} catch (err) {
console.error('GET /auth/login', err);
send(res, 500);
}
});
app.get('/auth/callback', async (req, res) => {
try {
// Trade "code" for "access_token"
const r1 = await post(`${OAuth}/access_token?` + stringify({
code: req.query.code,
client_id: GITHUB_CLIENT_ID,
client_secret: GITHUB_CLIENT_SECRET,
}));
// Now fetch User details // serve static files
const { access_token } = parse(r1.data);
const r2 = await get('https://api.github.com/user', {
headers: {
'User-Agent': 'svelte.dev',
Authorization: `token ${access_token}`
}
});
const { id: uid, name, avatar_url, login } = r2.data;
// Upsert `users` table
const [user] = await query(`
insert into users(uid, name, username, avatar, github_token)
values ($1, $2, $3, $4, $5) on conflict (uid) do update
set (name, username, avatar, github_token, updated_at) = ($2, $3, $4, $5, now())
returning *
`, [uid, name, login, avatar_url, access_token]);
const session = await find(`
insert into sessions(user_id)
values ($1)
returning *
`, [user.id]);
const cookie = [
`sid=${session.uid}`,
`Max-Age=31536000`,
`Path=/`,
`HttpOnly`
];
res.writeHead(200, {
'Set-Cookie': cookie.join('; '),
'Content-Type': 'text/html; charset=utf-8'
});
res.end(`
<script>
window.opener.postMessage({
user: ${devalue(to_user(user))}
}, window.location.origin);
</script>
`);
} catch (err) {
console.error('GET /auth/callback', err);
send(res, 500, err.data, {
'Content-Type': err.headers['content-type'],
'Content-Length': err.headers['content-length']
});
}
});
} else {
// Print "Misconfigured" error
app.get('/auth/login', (req, res) => {
send(res, 500, `
<body style="font-family: sans-serif; background: rgb(255,215,215); border: 2px solid red; margin: 0; padding: 1em;">
<h1>Missing .env file</h1>
<p>In order to use GitHub authentication, you will need to <a target="_blank" href="https://github.com/settings/developers">register an OAuth application</a> and create a local .env file:</p>
<pre>GITHUB_CLIENT_ID=[YOUR_APP_ID]\nGITHUB_CLIENT_SECRET=[YOUR_APP_SECRET]\nBASEURL=http://localhost:3000</pre>
<p>The <code>BASEURL</code> variable should match the callback URL specified for your app.</p>
<p>See also <a target="_blank" href="https://github.com/sveltejs/svelte/tree/master/site#repl-github-integration">here</a></p>
</body>
`, {
'Content-Type': 'text/html; charset=utf-8'
});
});
}
app.use(
sirv('static', { sirv('static', {
dev: process.env.NODE_ENV === 'development', dev: process.env.NODE_ENV === 'development',
setHeaders(res) { setHeaders(res) {
@ -159,6 +43,7 @@ app.use(
} }
}), }),
// run Sapper
sapper.middleware({ sapper.middleware({
session: req => ({ session: req => ({
user: to_user(req.user) user: to_user(req.user)

6
site/src/utils/auth.js
Unescape View File

@ -0,0 +1,6 @@
export const to_user = obj => obj && ({
uid: obj.uid,
username: obj.username,
name: obj.name,
avatar: obj.avatar
});
Write Preview
Loading…
Cancel
Save