From 7dfea45e12f8b3e38395eb308cfb8dd4698f146e Mon Sep 17 00:00:00 2001
From: Elizabeth Hunt <elizabeth.hunt@simponic.xyz>
Date: Wed, 5 Apr 2023 01:24:48 -0600
Subject: [PATCH] more auth fixes (logout not removing localstorage objects)

---
 client/src/components/timerHeader.tsx | 6 ++++--
 client/src/context/authContext.tsx    | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/client/src/components/timerHeader.tsx b/client/src/components/timerHeader.tsx
index 08e2965..28cae91 100644
--- a/client/src/components/timerHeader.tsx
+++ b/client/src/components/timerHeader.tsx
@@ -20,10 +20,12 @@ export default function TimerHeader({
   const [modalOpen, setModalOpen] = useState<boolean>(false);
   const [newTimerName, setNewTimerName] = useState<string>("");
   const [errors, setErrors] = useState<string[]>([]);
-  const { friendName, setSignedIn } = useAuthContext();
+  const { friendName, setSessionOver } = useAuthContext();
 
   const logout = () => {
-    fetch("/api/auth/logout").then(() => setSignedIn(false));
+    fetch("/api/auth/logout").then(() => {
+      setSessionOver(new Date());
+    });
   };
 
   const createTimer = (e: any) => {
diff --git a/client/src/context/authContext.tsx b/client/src/context/authContext.tsx
index 19a1ddd..5973f39 100644
--- a/client/src/context/authContext.tsx
+++ b/client/src/context/authContext.tsx
@@ -79,10 +79,13 @@ export const AuthProvider = ({ children }: { children: React.ReactNode }) => {
             }
             return !!signedIn;
           });
+        } else {
+          setSignedIn(true);
         }
+
         return sessionOver;
       });
-    }, sessionOver.getTime() - Date.now());
+    }, Math.max(0, sessionOver.getTime() - Date.now()));
   }, [sessionOver]);
 
   return (