Skip to content

fix login #281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 8, 2024
Merged

fix login #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/svelte.dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
"cookie": "^0.6.0",
"d3-geo": "^3.1.0",
"d3-geo-projection": "^4.0.0",
"devalue": "^5.0.0",
"do-not-zip": "^1.0.0",
"flexsearch": "^0.7.43",
"flru": "^1.0.2",
Expand Down
21 changes: 10 additions & 11 deletions apps/svelte.dev/src/routes/(authed)/+layout.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
<script lang="ts">
import { invalidateAll } from '$app/navigation';
import { storage_key } from '../auth/_config';
import { set_app_context } from './app-context';

set_app_context({
login: () => {
const login_window = window.open(
`${window.location.origin}/auth/login`,
'login',
'width=600,height=400'
);
login: async () => {
window.open(`${window.location.origin}/auth/login`, 'login', 'width=600,height=400');

window.addEventListener('message', function handler(event) {
if (event.data.source !== 'svelte-auth') return;
login_window!.close();
window.removeEventListener('message', handler);
invalidateAll();
// we can't interact directly with opener, so we use localStorage as a side channel
window.addEventListener('storage', function handler(event) {
if (event.key === storage_key) {
invalidateAll();
window.removeEventListener('storage', handler);
this.localStorage.clearItem(storage_key);
}
});
},

Expand Down
6 changes: 1 addition & 5 deletions apps/svelte.dev/src/routes/auth/_config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
import { GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET } from '$env/static/private';

export const oauth = 'https://github.com/login/oauth';

export const client_id = GITHUB_CLIENT_ID;
export const client_secret = GITHUB_CLIENT_SECRET;
export const storage_key = 'login';
18 changes: 6 additions & 12 deletions apps/svelte.dev/src/routes/auth/callback/+server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { uneval } from 'devalue';
import * as cookie from 'cookie';
import * as session from '$lib/db/session';
import { oauth, client_id, client_secret } from '../_config.js';
import { oauth, storage_key } from '../_config.js';
import { GITHUB_CLIENT_ID, GITHUB_CLIENT_SECRET } from '$env/static/private';

export async function GET({ url }) {
// Trade "code" for "access_token"
const code = url.searchParams.get('code') || undefined;
const params = new URLSearchParams({
client_id,
client_secret
client_id: GITHUB_CLIENT_ID,
client_secret: GITHUB_CLIENT_SECRET
});
if (code) params.set('code', code);
const r1 = await fetch(`${oauth}/access_token?` + params.toString());
Expand All @@ -34,15 +34,9 @@ export async function GET({ url }) {
};
const { sessionid, expires } = await session.create(user);

// we can't interact directly with opener, so we use localStorage as a side channel
return new Response(
`
<script>
window.opener.postMessage({
source: 'svelte-auth',
user: ${uneval(user)}
}, window.location.origin);
</script>
`,
`<script>localStorage.setItem('${storage_key}', Date.now()); window.close()</script>`,
{
headers: {
'Set-Cookie': cookie.serialize('sid', sessionid, {
Expand Down
60 changes: 30 additions & 30 deletions apps/svelte.dev/src/routes/auth/login/+server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
import { redirect } from '@sveltejs/kit';
import { client_id, oauth } from '../_config.js';
import { oauth } from '../_config.js';
import { GITHUB_CLIENT_ID } from '$env/static/private';

export const GET = client_id
? /** @param {{url: URL}} opts */ ({ url }) => {
const Location =
`${oauth}/authorize?` +
new URLSearchParams({
scope: 'read:user',
client_id,
redirect_uri: `${url.origin}/auth/callback`
}).toString();

redirect(302, Location);
}
: () =>
new Response(
`
<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:5173</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/svelte-4/sites/svelte.dev#repl-github-integration">here</a></p>
</body>
`,
{
status: 500,
headers: {
'Content-Type': 'text/html; charset=utf-8'
}
export function GET({ url }) {
if (!GITHUB_CLIENT_ID) {
return new Response(
`
<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:5173</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/svelte-4/sites/svelte.dev#repl-github-integration">here</a></p>
</body>
`,
{
status: 500,
headers: {
'Content-Type': 'text/html; charset=utf-8'
}
);
}
);
}

const params = new URLSearchParams({
scope: 'read:user',
client_id: GITHUB_CLIENT_ID,
redirect_uri: `${url.origin}/auth/callback`
});

redirect(302, `${oauth}/authorize?${params}`);
}
3 changes: 0 additions & 3 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading