fix(portal): user would be redirected to incorrect pages depending on state

Author: HasithDeAlwis

apps/portal/app/routes/_index.tsx

@@ -29,8 +29,19 @@ export const loader: LoaderFunction = async ({ request }) => {
       return redirect('/profile')
     }
 
+    const forms = await fetch(`${API_URL}/api/form-submissions?where[submittedBy][equals]=${user.id}`, {
+      method: 'GET',
+      headers: { Cookie: cookie || '' },
+    })
+
+    const userForms = await forms.json()
+    if (!userForms.docs.length) {
+      return redirect('/registration')
+    }
+
     return redirect('/dashboard')
   }
+
   catch (error) {
     return redirect('/login')
   }

apps/portal/app/routes/dashboard.tsx

@@ -1,44 +1,15 @@
-/* eslint-disable unused-imports/no-unused-vars */
-import type { User } from '@cuhacking/portal/types/user'
+import type { UserDetails } from '@cuhacking/portal/types/user'
 import type { LoaderFunction } from '@remix-run/node'
 import process from 'node:process'
 import { Home } from '@cuhacking/portal/pages/index/index'
 import { json, redirect } from '@remix-run/node'
 import { useLoaderData } from '@remix-run/react'
 
-/* export const loader: LoaderFunction = async () => {
-*   const snapshot = userFlowActor.getSnapshot()
-*   if (!snapshot) {
-*     return redirect('/login')
-*   }
-*
-*   const currentState = snapshot.value
-*   const error = snapshot.context.error
-*
-*   if (error) {
-*     return redirect('/error')
-*   }
-*
-*   switch (currentState) {
-*     case 'unauthenticated':
-*       return redirect('/login')
-*     case 'legal':
-*       return redirect('/terms')
-*     case 'profile_incomplete':
-*       return redirect('/profile')
-*     case 'dashboard':
-*     case 'registered':
-*       return null
-*     default:
-*       return redirect('/login')
-*   }
-* } */
-
 export const loader: LoaderFunction = async ({ request }) => {
   const cookie = request.headers.get('Cookie')
 
   try {
-    const API_URL = `${process.env.NODE_ENV} === 'development' ? http://localhost:8000 : https://axiom.cuhacking.ca`
+    const API_URL = process.env.NODE_ENV === 'development' ? 'http://localhost:8000' : 'https://axiom.cuhacking.ca'
     const res = await fetch(`${API_URL}/api/users/me`, {
       headers: { Cookie: cookie || '' },
     })
@@ -50,36 +21,36 @@ export const loader: LoaderFunction = async ({ request }) => {
     const { user } = await res.json()
 
     if (!user) {
-      return redirect('/login')
+      return redirect('/')
     }
 
     if (!user.agreedToTerms) {
-      return redirect('/terms')
+      return redirect('/')
     }
 
     if (!user.emergencyContactFullName) {
-      return redirect('/profile')
+      return redirect('/')
     }
 
-    /* const forms = await fetch(`${API_URL}/api/form-submissions?where[submittedBy][equals]=${user.id}`, {
-*   method: 'GET',
-*   headers: { Cookie: cookie || '' },
-* })
+    const forms = await fetch(`${API_URL}/api/form-submissions?where[submittedBy][equals]=${user.id}`, {
+      method: 'GET',
+      headers: { Cookie: cookie || '' },
+    })
 
-* const userForms = await forms.json()
-* if (!userForms.docs.length) {
-*   return redirect('/registration')
-* } */
+    const userForms = await forms.json()
+    if (!userForms.docs.length) {
+      return redirect('/registration')
+    }
 
     return json(user)
   }
-  catch (error) {
-    return redirect('/login')
+  catch {
+    return redirect('/')
   }
 }
 
 export default function Dashboard() {
-  const user = useLoaderData<User>()
+  const user = useLoaderData<UserDetails>()
 
   return <Home user={user} />
 }

apps/portal/app/routes/profile.tsx

@@ -26,13 +26,13 @@ export const loader: LoaderFunction = async ({ request }) => {
     const { user } = await res.json()
 
     if (!user) {
-      return redirect('/login')
+      return redirect('/')
     }
 
     return json({ user, cookie, API_URL })
   }
   catch {
-    return redirect('/login')
+    return redirect('/')
   }
 }
 

apps/portal/app/routes/registration.tsx

@@ -24,7 +24,7 @@ export const loader: LoaderFunction = async ({ request }) => {
     const { user } = await me.json()
 
     if (!user) {
-      return redirect('/login')
+      return redirect('/')
     }
 
     const forms = await fetch(`${API_URL}/api/form-submissions?where[submittedBy][equals]=${user.id}`, {
@@ -33,12 +33,12 @@ export const loader: LoaderFunction = async ({ request }) => {
     })
     const userForms = await forms.json()
     if (userForms.docs.length) {
-      return redirect('/dashboard')
+      return redirect('/')
     }
     return json({ user, cookie, API_URL })
   }
   catch {
-    return redirect('/login')
+    return redirect('/')
   }
 }
 

apps/portal/app/routes/terms.tsx

@@ -38,7 +38,7 @@ export const action: ActionFunction = async ({ request }) => {
   const userId = session.get('userId')
 
   if (!userId) {
-    return redirect('/login')
+    return redirect('/')
   }
   return await updateTerms(userId, cookie)
 }