- signIn('auth0', { callbackUrl: returnTo })}
class="focus:ring-red inline-flex w-full justify-center rounded-md
border border-transparent bg-red-600 px-4 py-2 text-base
font-medium leading-6 text-white shadow-sm transition
duration-150 ease-in-out hover:bg-red-500 focus:border-red-700
focus:outline-none sm:text-sm sm:leading-5">
Login
-
+
{
+ let _url = '/';
+ try {
+ const session = await locals.getSession();
+ if (!session?.user) {
+ const tokenCall = await fetch('/auth/csrf');
+ const csrfTokenResponse = await new Response(tokenCall.body).json();
+ const csrfToken = csrfTokenResponse.csrfToken;
+
+ const qparams = new URLSearchParams();
+ qparams.append('screen_hint', 'signup');
+
+ const formData = new URLSearchParams();
+ formData.append('redirect', 'false');
+ formData.append('csrfToken', csrfToken);
+ formData.append('callbackUrl', '/my/profiles');
+
+ const signInRequest = await fetch('/auth/signin/auth0?' + qparams.toString(), {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/x-www-form-urlencoded',
+ 'X-Auth-Return-Redirect': '1'
+ },
+ body: formData.toString()
+ });
+
+ const signInResponse = await new Response(signInRequest.body).json();
+ if (signInResponse?.url) {
+ _url = signInResponse.url;
+ }
+ }
+ } catch (err) {
+ Sentry.setContext('error', { err });
+ throw error(500, 'Authentication Sign-up Error');
+ }
+
+ if (_url) {
+ throw redirect(302, _url);
+ }
+ }
+};
diff --git a/src/routes/(root)/signup/+page.svelte b/src/routes/(root)/signup/+page.svelte
index 3b5c263..24b2ead 100644
--- a/src/routes/(root)/signup/+page.svelte
+++ b/src/routes/(root)/signup/+page.svelte
@@ -5,6 +5,7 @@
import Seo from '$components/Seo.svelte';
import { Standard as StandardLink } from '$elements/links';
import Newsletter from '$components/newsletter/Short.svelte';
+ import { ChevronsRight } from 'lucide-svelte';
import WelcomeQuote from '../support/_components/_WelcomeQuote.svelte';
@@ -40,24 +41,27 @@
-
-
-
-
-
-
-
-
-
-
-
- Create Your Login
-
- You will need an account to create or join any activities.
-
-
-
+
-
@@ -76,6 +80,9 @@
Tell everyone a bit about who you are and where to find you on the internet.
+
+
+
@@ -92,6 +99,9 @@
We've put together a few words on how to get started with THAT.
+
+
+
diff --git a/src/routes/(root)/speakers/+layout.js b/src/routes/(root)/speakers/+layout.js
deleted file mode 100644
index 71527de..0000000
--- a/src/routes/(root)/speakers/+layout.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import auth0 from '$lib/security/client';
-export const load = auth0.withPageAuthRequired();
diff --git a/src/routes/(root)/speakers/+layout.server.js b/src/routes/(root)/speakers/+layout.server.js
new file mode 100644
index 0000000..59fbcd0
--- /dev/null
+++ b/src/routes/(root)/speakers/+layout.server.js
@@ -0,0 +1,4 @@
+/* This empty page is intentional
+ * having this +layout.server page here forces the hooks.server handler to execute
+ * https://github.com/sveltejs/kit/issues/6315
+ */
diff --git a/src/routes/+layout.server.js b/src/routes/+layout.server.js
index eb6fce4..1966731 100644
--- a/src/routes/+layout.server.js
+++ b/src/routes/+layout.server.js
@@ -1,4 +1,3 @@
-import auth0 from '$lib/security/server';
import config from '$lib/config.public';
import { QUERY_ME } from '$dataSources/api.that.tech/me';
import { loadFlashMessage } from 'sveltekit-flash-message/server';
@@ -26,8 +25,8 @@ async function queryMe(accessToken) {
}
export const load = loadFlashMessage(async (event) => {
- let { request, locals } = event;
- const auth0Session = await auth0.getSession(request);
+ let { locals } = event;
+ const auth0Session = await locals.getSession();
let user = {
isAuthenticated: !!auth0Session?.user,
diff --git a/src/routes/api/auth/callback/+server.js b/src/routes/api/auth/callback/+server.js
deleted file mode 100644
index c9ef1d2..0000000
--- a/src/routes/api/auth/callback/+server.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import auth0 from '$lib/security/server';
-
-export function GET({ request }) {
- return auth0.handleCallback(request);
-}
diff --git a/src/routes/api/auth/me/+server.js b/src/routes/api/auth/me/+server.js
deleted file mode 100644
index 8a93cd7..0000000
--- a/src/routes/api/auth/me/+server.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import auth0 from '$lib/security/server';
-
-export function GET({ request }) {
- return auth0.handleProfile(request, { refetch: true });
-}
diff --git a/src/routes/api/auth/proxy/+server.js b/src/routes/api/auth/proxy/+server.js
index e883c01..7ca2f76 100644
--- a/src/routes/api/auth/proxy/+server.js
+++ b/src/routes/api/auth/proxy/+server.js
@@ -1,19 +1,19 @@
-import auth0 from '$lib/security/server';
import { json, error } from '@sveltejs/kit';
import fetch from 'isomorphic-fetch';
import config from '$lib/config.public';
import * as Sentry from '@sentry/svelte';
-export async function POST({ request }) {
+export async function POST({ request, locals }) {
const body = await request.json();
- try {
- const { accessToken } = await auth0.getAccessToken(request);
+ const session = await locals.getSession();
+ const accessToken = session?.accessToken;
- if (!accessToken) {
- throw error(401, 'Unauthorized Access');
- }
+ if (!accessToken) {
+ throw error(401, 'Unauthorized Access');
+ }
+ try {
const results = await fetch(config.api.direct, {
method: 'POST',
headers: {
diff --git a/src/routes/api/auth/signup/+server.js b/src/routes/api/auth/signup/+server.js
deleted file mode 100644
index 015f711..0000000
--- a/src/routes/api/auth/signup/+server.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import auth0 from '$lib/security/server';
-
-export function GET({ request }) {
- return auth0.handleLogin(request, {
- authorizationParams: {
- screen_hint: 'signup',
- prompt: 'login'
- }
- });
-}