From 14ccc20f7ab2dec4a1ef98a7749e34fb0c082044 Mon Sep 17 00:00:00 2001
From: Sam Becker <sam@sambecker.com>
Date: Thu, 22 May 2025 09:21:03 -0500
Subject: [PATCH] Refine admin auth handling

---
 src/auth/index.ts              | 4 ++--
 src/state/AppStateProvider.tsx | 7 ++-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/auth/index.ts b/src/auth/index.ts
index 75b1f855..ee5a310e 100644
--- a/src/auth/index.ts
+++ b/src/auth/index.ts
@@ -22,8 +22,8 @@ export const hasAuthEmailCookie = () =>
 export const clearAuthEmailCookie = () =>
   deleteCookie(KEY_AUTH_EMAIL);
 
-export const isCredentialsSignInError = (error: any) =>
-  (error.message || `${error}`).includes(KEY_CREDENTIALS_SIGN_IN_ERROR);
+export const isCredentialsSignInError = (error?: any) =>
+  (error?.message || `${error}`).includes(KEY_CREDENTIALS_SIGN_IN_ERROR);
 
 export const generateAuthSecret = () => fetch(
   'https://generate-secret.vercel.app/32',
diff --git a/src/state/AppStateProvider.tsx b/src/state/AppStateProvider.tsx
index 1368ac58..4a352f71 100644
--- a/src/state/AppStateProvider.tsx
+++ b/src/state/AppStateProvider.tsx
@@ -18,7 +18,6 @@ import { AdminData, getAdminDataAction } from '@/admin/actions';
 import {
   storeAuthEmailCookie,
   clearAuthEmailCookie,
-  isCredentialsSignInError,
   getAuthEmailCookie,
 } from '@/auth';
 import { useRouter, usePathname } from 'next/navigation';
@@ -125,12 +124,10 @@ export default function AppStateProvider({
     setUserEmailEager(getAuthEmailCookie());
   }, []);
   useEffect(() => {
-    if (authError) {
+    if (auth === null || authError) {
       setUserEmail(undefined);
       setUserEmailEager(undefined);
-      if (isCredentialsSignInError(authError)) {
-        clearAuthEmailCookie();
-      }
+      clearAuthEmailCookie();
     } else {
       setUserEmail(auth?.user?.email ?? undefined);
     }