fix: tweak auth guard

creatorsgarten · Aug 22, 2023 · 508c467 · 508c467
1 parent 62228f7
commit 508c467
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/src/lib/auth.tsx b/src/lib/auth.tsx
@@ -61,21 +61,25 @@ export const AuthProvider = ({
             // should not have user
             case '/':
                 break;
+            case '/event':
             case '/event/create':
                 if (!user) {
                     router.push('/login');
                 }
                 break;
+
+            // event with id
+
             case '/login':
                 if (user) {
                     router.push('/');
                 }
                 break;
             // should have user
             default:
-                if (!user) {
-                    router.push('/login');
-                }
+                // if (!user) {
+                //     router.push('/login');
+                // }
                 break;
         }
     }, [user, router]);

diff --git a/src/pages/event/[id]/index.tsx b/src/pages/event/[id]/index.tsx
@@ -35,6 +35,7 @@ import useScheduleSlot from '@/hooks/useScheduleSlot';
 import { useRouter } from 'next/router';
 
 import QrCode from 'react-qr-code';
+import { useAuth } from '@/lib/auth';
 
 export function getServerSideProps({ params }: { params: { id: string } }) {
     return {
@@ -51,11 +52,18 @@ export default function View({
     const { scheduleSlots, currentSlot, nextSlot, currentTime } =
         useScheduleSlot(id);
     const router = useRouter();
+    const { user } = useAuth();
 
     useEffect(() => {
         runOneSignal();
     }, []);
 
+    useEffect(() => {
+        if (!user) {
+            router.push('/login');
+        }
+    }, [user, router]);
+
     const handleOnDeleteTaskData = (data: ScheduleSlot) => {
         deleteTask(id, scheduleSlots, data);
     };