-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #111 from ThatConference/next/feature
Promote Next/feature to production
- Loading branch information
Showing
34 changed files
with
569 additions
and
1,351 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| import * as Sentry from '@sentry/sveltekit'; | ||
| import { env } from '$env/dynamic/public'; | ||
| import { logging } from '$lib/config.public'; | ||
|
|
||
| Sentry.init({ | ||
| dsn: 'https://857800ed593d481bb0da2843516d7845@o235190.ingest.sentry.io/4504617287417856', | ||
| dsn: logging.dsn, | ||
| tracesSampleRate: 1, | ||
| replaysSessionSampleRate: 0.1, | ||
| replaysOnErrorSampleRate: 1, | ||
| integrations: [new Sentry.Replay()], | ||
| environment: env.PUBLIC_VERCEL_ENV | ||
| environment: logging.environment | ||
| }); | ||
|
|
||
| export const handleError = Sentry.handleErrorWithSentry(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,103 @@ | ||
| import { redirect } from '@sveltejs/kit'; | ||
| import { sequence } from '@sveltejs/kit/hooks'; | ||
| import { env } from '$env/dynamic/public'; | ||
| import { SvelteKitAuth } from '@auth/sveltekit'; | ||
| import Auth0Provider from '@auth/core/providers/auth0'; | ||
| import * as Sentry from '@sentry/sveltekit'; | ||
|
|
||
| import { logging } from '$lib/config.public'; | ||
| import { parseOnly } from '$lib/svelteAuth/parseJwt'; | ||
|
|
||
| import { securityConfig as publicConfig } from '$lib/config.public'; | ||
| import { securityConfig as privateConfig } from '$lib/config.private'; | ||
|
|
||
| const { clientID, issuerBaseURL } = publicConfig(); | ||
| const { clientSecret, secret } = privateConfig(); | ||
|
|
||
| Sentry.init({ | ||
| dsn: 'https://857800ed593d481bb0da2843516d7845@o235190.ingest.sentry.io/4504617287417856', | ||
| tracesSampleRate: 1, | ||
| environment: env.PUBLIC_VERCEL_ENV | ||
| dsn: logging.dsn, | ||
| environment: logging.environment, | ||
| tracesSampleRate: 1 | ||
| }); | ||
|
|
||
| const loginRedirectPaths = ['/my', '/sponsor-admin', '/admin', '/speakers']; | ||
|
|
||
| async function authorization({ event, resolve }) { | ||
| if ( | ||
| loginRedirectPaths.reduce((a, c) => { | ||
| if (event.url.pathname.startsWith(c)) { | ||
| a = true; | ||
| } | ||
| return a; | ||
| }, false) | ||
| ) { | ||
| const session = await event.locals.getSession(); | ||
| if (!session?.user) { | ||
| let toPath = event.url.pathname; | ||
| if (event.url.searchParams.size > 0) { | ||
| toPath += `?${event.url.searchParams.toString()}`; | ||
| } | ||
| throw redirect(303, `/login-redirect?returnTo=${toPath}`); | ||
| } | ||
| } | ||
|
|
||
| return resolve(event); | ||
| } | ||
|
|
||
| const authConfig = { | ||
| providers: [ | ||
| Auth0Provider({ | ||
| id: 'auth0', | ||
| name: 'Auth0', | ||
| clientId: clientID, | ||
| clientSecret, | ||
| issuer: issuerBaseURL, | ||
| wellKnown: 'https://auth.that.tech/.well-known/openid-configuration', | ||
| authorization: { | ||
| params: { | ||
| audience: 'https://api.that.tech/graphql', | ||
| scope: 'openid profile email offline_access' | ||
| } | ||
| } | ||
| }) | ||
| ], | ||
| secret, | ||
| debug: false, | ||
| session: { | ||
| maxAge: 3600 * 24 // 1440 mins, 1 day | ||
| }, | ||
| callbacks: { | ||
| redirect(redirectGoo) { | ||
| const { url, baseUrl } = redirectGoo; | ||
| if (url.startsWith('/')) return `${baseUrl}${url}`; | ||
| // Allows callback URLs on the same origin | ||
| else if (new URL(url).origin === baseUrl) return url; | ||
| return baseUrl; | ||
| }, | ||
| jwt(jwtGoo) { | ||
| const { account, token } = jwtGoo; | ||
| if (account) { | ||
| token.accessToken = account.access_token; | ||
| token.idToken = account.id_token; | ||
| } | ||
| return token; | ||
| }, | ||
| session(sessionGoo) { | ||
| const { session, token } = sessionGoo; | ||
| session.accessToken = token.accessToken; | ||
| session.idToken = token.idToken; | ||
| session.user.id = token.sub; | ||
| session.user.sub = token.sub; | ||
| const payload = parseOnly(token.accessToken); | ||
| if (payload) { | ||
| const { permissions } = payload; | ||
| if (permissions && Array.isArray(permissions)) { | ||
| session.user.permissions = permissions; | ||
| } | ||
| } | ||
| return session; | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| export const handleError = Sentry.handleErrorWithSentry(); | ||
| export const handle = sequence(Sentry.sentryHandle()); | ||
| export const handle = sequence(Sentry.sentryHandle(), SvelteKitAuth(authConfig), authorization); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
a703181There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to the following URLs:
thatconference-com – ./
thatconference-com.vercel.app
thatconference-com-that-conference.vercel.app
thatconference-com-git-main-that-conference.vercel.app
thatconference.com