feat: refactor authentication logic by creating getSSRLoggedInAccount utility function and updating layout component

mitchdowney · mitchdowney · commit 68e18dfc8cdc · 2025-07-15T14:11:42.000-05:00
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
@@ -11,8 +11,7 @@ import WindowWrapper from '../components/Window/WindowWrapper';
 import Providers from '../providers/Providers';
 import { toUITheme } from '../utils/theme';
 import { Modals } from '../components/Modals/Modals';
-import { getSSRApiRequestService } from '../factories/apiRequestService';
-import { DTOAccount } from 'podverse-helpers';
+import { getSSRLoggedInAccount } from '../utils/auth/getSSRLoggedInAccount';
 
 export const metadata = {
   title: 'Podverse',
@@ -23,23 +22,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo
   const [locale, cookieStore] = await Promise.all([getLocale(), cookies()]);
   const cookieTheme = cookieStore.get('theme')?.value;
   const theme = toUITheme(cookieTheme);
-
-  let jwt;
-  if (typeof window === "undefined") {
-    const cookieStore = await cookies();
-    jwt = cookieStore.get("jwt")?.value;
-  }
-  const ssrApiRequestService = getSSRApiRequestService(jwt);
-
-  const hello = await ssrApiRequestService.reqAccountGetManyPublic();
-  console.log(hello);
-
-  let ssrLoggedInAccount: DTOAccount | null = null;
-  try {
-    ssrLoggedInAccount = await ssrApiRequestService.reqAuthMe();
-  } catch (error) {
-    // do nothing
-  }
+  const ssrLoggedInAccount = await getSSRLoggedInAccount();
 
   return (
     <html lang={locale} data-theme={theme}>
diff --git a/src/utils/auth/getSSRLoggedInAccount.ts b/src/utils/auth/getSSRLoggedInAccount.ts
@@ -0,0 +1,15 @@
+import { cookies } from 'next/headers';
+import { getSSRApiRequestService } from '../../factories/apiRequestService';
+import { DTOAccount } from 'podverse-helpers';
+
+export async function getSSRLoggedInAccount(): Promise<DTOAccount | null> {
+  const cookieStore = await cookies();
+  const jwt = cookieStore.get("jwt")?.value;
+  const ssrApiRequestService = getSSRApiRequestService(jwt);
+
+  try {
+    return await ssrApiRequestService.reqAuthMe();
+  } catch {
+    return null;
+  }
+}
