feat: middleware support for oauth

apps/web/components/Contexts/CourseContext.tsx

@@ -38,7 +38,7 @@ export function CourseProvider({
     }
   }, [courseStructureData,session])
 
-  if (!courseStructureData) return <PageLoading></PageLoading>
+  if (!courseStructureData) return 
 
   return (
     <CourseContext.Provider value={courseStructure}>

apps/web/components/Contexts/LHSessionContext.tsx

@@ -10,16 +10,17 @@ function LHSessionProvider({ children }: { children: React.ReactNode }) {
 
     useEffect(() => {
         console.log('useLHSession', session);
-    }, [session])
+    }, [])
 
 
-    if (session.status == 'loading') {
+    if (session && session.status == 'loading') {
         return <PageLoading />
     }
 
-    else {
+    else if (session) {
         return (
             <SessionContext.Provider value={session}>
+                {console.log('rendered')}
                 {children}
             </SessionContext.Provider>
         )

apps/web/components/Contexts/OrgContext.tsx

@@ -1,7 +1,7 @@
 'use client'
 import { getAPIUrl } from '@services/config/config'
 import { swrFetcher } from '@services/utils/ts/requests'
-import React, { useContext, useEffect } from 'react'
+import React, { useContext, useEffect, useState } from 'react'
 import useSWR from 'swr'
 import { createContext } from 'react'
 import { useRouter } from 'next/navigation'
@@ -20,24 +20,31 @@ export function OrgProvider({
   const session = useLHSession() as any;
   const access_token = session?.data?.tokens?.access_token;
   const { data: org } = useSWR(`${getAPIUrl()}orgs/slug/${orgslug}`, (url) => swrFetcher(url, access_token))
+  const [isLoading, setIsLoading] = useState(true);
+  const [isOrgActive, setIsOrgActive] = useState(true);
 
-  const router = useRouter()
   // Check if Org is Active 
   const verifyIfOrgIsActive = () => {
     if (org && org?.config.config.GeneralConfig.active === false) {
-      router.push('/404')
+      setIsOrgActive(false)
+    }
+    else {
+      setIsOrgActive(true)
     }
-
   }
-  useEffect(() => {
-    verifyIfOrgIsActive()
-  }, [org])
 
-  if (org) {
+  useEffect(() => {
+    if (org && session) {
+      verifyIfOrgIsActive()
+      setIsLoading(false)
+    }
+  }, [org, session])
+
+  if (!isLoading) {
     return <OrgContext.Provider value={org}>{children}</OrgContext.Provider>
   }
-  else {
-    return <ErrorUI />
+  if (!isOrgActive) {
+    return <ErrorUI message='This organization is no longer active' />
   }
 }