From 1d179bd5049be8ae1ffab33e69a841c25e6b1391 Mon Sep 17 00:00:00 2001 From: Sam Becker Date: Fri, 5 Jan 2024 19:01:05 -0600 Subject: [PATCH] Remove auth session provider --- src/app/(auth-state)/layout.tsx | 11 +++++---- src/site/FooterAuth.tsx | 42 +++++++++++---------------------- 2 files changed, 20 insertions(+), 33 deletions(-) diff --git a/src/app/(auth-state)/layout.tsx b/src/app/(auth-state)/layout.tsx index 1093e968..a4ecefda 100644 --- a/src/app/(auth-state)/layout.tsx +++ b/src/app/(auth-state)/layout.tsx @@ -1,18 +1,19 @@ import FooterAuth from '@/site/FooterAuth'; import PageContentContainer from '@/components/PageContentContainer'; -import { SessionProvider } from 'next-auth/react'; +import { auth } from '@/auth'; -export default function RootLayout({ +export default async function RootLayout({ children, }: { children: React.ReactNode }) { + const session = await auth(); return ( - + <> {children} - - + + ); } diff --git a/src/site/FooterAuth.tsx b/src/site/FooterAuth.tsx index a4bb2e4a..19e634f4 100644 --- a/src/site/FooterAuth.tsx +++ b/src/site/FooterAuth.tsx @@ -1,8 +1,6 @@ 'use client'; import { clsx } from 'clsx/lite'; -import Link from 'next/link'; -import { useSession } from 'next-auth/react'; import ThemeSwitcher from '@/site/ThemeSwitcher'; import SiteGrid from '../components/SiteGrid'; import { usePathname } from 'next/navigation'; @@ -16,9 +14,11 @@ const LINK_STYLE = clsx( 'hover:dark:text-gray-600', ); -export default function FooterAuth() { - const { data: session, status } = useSession(); - +export default function FooterAuth({ + email, +}: { + email: string | null | undefined +}) { const path = usePathname(); return ( @@ -29,29 +29,15 @@ export default function FooterAuth() { 'text-dim', )}>
- {status === 'loading' - ? <>Loading ... - : <> - {session?.user?.email &&
- {session.user.email} -
} - {status === 'authenticated' && -
- - Sign Out - -
} - {status === 'unauthenticated' && - - Sign In - } - } +
{email}
+
+ + Sign Out + +
{!isPathSignIn(path) && } }