From ef15444d37017f6c2488bc75f8c0be8507abb82e Mon Sep 17 00:00:00 2001 From: Marek Miklaszewski Date: Thu, 27 Apr 2023 12:25:23 +0200 Subject: [PATCH 1/3] Log provider session --- apps/next-app/src/pages/auth/provider/index.tsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/next-app/src/pages/auth/provider/index.tsx b/apps/next-app/src/pages/auth/provider/index.tsx index 1296443..2499489 100644 --- a/apps/next-app/src/pages/auth/provider/index.tsx +++ b/apps/next-app/src/pages/auth/provider/index.tsx @@ -10,12 +10,15 @@ const Provider = () => { useEffect(() => { const getSession = async () => { const session = await supabase.auth.getSession(); - router.replace(session ? ROUTES.DASHBOARD : ROUTES.LOGIN); + console.log('SESSION', session); + if (session) { + router.replace(ROUTES.DASHBOARD); + } }; getSession(); }, [router, supabase.auth]); - return null; + return
Provider
; }; export default Provider; From 94b5fde4d5de15c23a92d6a38acd9437a60f71e7 Mon Sep 17 00:00:00 2001 From: Marek Miklaszewski Date: Thu, 27 Apr 2023 13:01:36 +0200 Subject: [PATCH 2/3] Remove layout --- apps/next-app/src/pages/_app.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/next-app/src/pages/_app.tsx b/apps/next-app/src/pages/_app.tsx index f422921..1c11412 100644 --- a/apps/next-app/src/pages/_app.tsx +++ b/apps/next-app/src/pages/_app.tsx @@ -28,9 +28,7 @@ export default function App({ Component, pageProps }: CustomAppProps) { >
- - ) - + )
From b6bc4f6a20d4ded10e191c26acb4ddd4bfb49add Mon Sep 17 00:00:00 2001 From: Marek Miklaszewski Date: Thu, 27 Apr 2023 13:08:19 +0200 Subject: [PATCH 3/3] Exclude /auth/provider from layout --- apps/next-app/src/pages/_app.tsx | 15 +++++++++++++-- apps/next-app/src/pages/auth/provider/index.tsx | 7 ++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/apps/next-app/src/pages/_app.tsx b/apps/next-app/src/pages/_app.tsx index 1c11412..e945370 100644 --- a/apps/next-app/src/pages/_app.tsx +++ b/apps/next-app/src/pages/_app.tsx @@ -7,6 +7,7 @@ import { ReactElement, ReactNode, useState } from 'react'; import { createBrowserSupabaseClient } from '@supabase/auth-helpers-nextjs'; import { NextPage } from 'next'; import { Layout } from 'shared/components/Layout'; +import { ROUTES } from 'constants/ROUTES'; const nunito = Nunito({ subsets: ['latin'], weight: ['300', '500', '700'] }); @@ -18,7 +19,11 @@ type CustomAppProps = AppProps & { initialSession: Session; }; -export default function App({ Component, pageProps }: CustomAppProps) { +export default function App({ + Component, + pageProps, + ...appProps +}: CustomAppProps) { const [supabaseClient] = useState(() => createBrowserSupabaseClient()); return ( @@ -28,7 +33,13 @@ export default function App({ Component, pageProps }: CustomAppProps) { >
- ) + {appProps.router.pathname === ROUTES.PROVIDER ? ( + + ) : ( + + + + )}
diff --git a/apps/next-app/src/pages/auth/provider/index.tsx b/apps/next-app/src/pages/auth/provider/index.tsx index 2499489..1296443 100644 --- a/apps/next-app/src/pages/auth/provider/index.tsx +++ b/apps/next-app/src/pages/auth/provider/index.tsx @@ -10,15 +10,12 @@ const Provider = () => { useEffect(() => { const getSession = async () => { const session = await supabase.auth.getSession(); - console.log('SESSION', session); - if (session) { - router.replace(ROUTES.DASHBOARD); - } + router.replace(session ? ROUTES.DASHBOARD : ROUTES.LOGIN); }; getSession(); }, [router, supabase.auth]); - return
Provider
; + return null; }; export default Provider;