@campxdev/shared 1.11.7-1.alpha.6 → 1.11.7-1.alpha.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "1.11.7-1.alpha.6",
+  "version": "1.11.7-1.alpha.8",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",

package/src/contexts/Providers.tsx

@@ -4,20 +4,66 @@ import MuiThemeProvider from '../theme/MuiThemeProvider'
 import QueryClientProvider from './QueryClientProvider'
 
 import Cookies from 'js-cookie'
-import { ReactNode } from 'react'
+import { ReactNode, useEffect } from 'react'
 import { ToastContainer } from '../components'
 import DialogProvider from '../components/DrawerWrapper/DrawerWrapper'
 import GlobalNetworkLoadingIndicator from '../components/ErrorBoundary/GlobalNetworkLoadingIndicator'
 import ErrorModalProvider from '../components/ErrorModalWrapper/ErrorModalWrapper'
 import RootModal from './RootModal'
 
-export const campxTenantKey = Cookies.get('campx_tenant')
-export const urlTenantKey = Cookies.get('campx_tenant')
-export const instituitionKey = window.location.pathname.split('/')[2]
+const isDevelopment = process.env.NODE_ENV == 'development'
+
+export const campxTenantKey = isDevelopment
+  ? window.location.pathname.split('/')[1]
+  : window.location.hostname.split('.')[0] ?? Cookies.get('campx_tenant')
+export const urlTenantKey = isDevelopment
+  ? window.location.pathname.split('/')[1]
+  : window.location.hostname.split('.')[0] ?? Cookies.get('campx_tenant')
+export const instituitionKey = isDevelopment
+  ? window.location.pathname.split('/')[2]
+  : window.location.pathname.split('/')[1]
 
 export default function Providers({ children }: { children: ReactNode }) {
+  const sessionKey = Cookies.get('campx_session_key')
+  var baseName = '/'
+  var tenantCode
+  var institutionCode
+
+  if (isDevelopment) {
+    tenantCode = window.location.pathname.split('/')[1]
+    institutionCode = window.location.pathname.split('/')[2]
+    if (
+      tenantCode &&
+      institutionCode &&
+      window.location.pathname !== '/auth/login'
+    ) {
+      baseName = `/${tenantCode}/${institutionCode}`
+    }
+  } else {
+    tenantCode = window.location.hostname.split('.')[0]
+    institutionCode = window.location.pathname.split('/')[1]
+
+    if (institutionCode && window.location.pathname !== '/auth/login') {
+      baseName = `/${institutionCode}`
+    }
+  }
+
+  useEffect(() => {
+    if (
+      isDevelopment &&
+      location.pathname === '/' &&
+      institutionCode &&
+      tenantCode
+    ) {
+      window.location.replace(
+        window.location.origin + `/${tenantCode}/${institutionCode}`,
+      )
+    } else if (location.pathname === '/' && institutionCode) {
+      window.location.replace(window.location.origin + `/${institutionCode}`)
+    }
+  }, [])
   return (
-    <BrowserRouter>
+    <BrowserRouter basename={baseName}>
       <QueryClientProvider>
         <MuiThemeProvider>
           <ConfirmContextProvider>

package/src/hooks/useAuth.ts

@@ -1,4 +1,3 @@
-import Cookies from 'js-cookie'
 import { useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import { toast } from 'react-toastify'
@@ -98,18 +97,18 @@ const useAuth = ({
   permissionsEndpoint,
   loginUrl,
 }: AuthParams): AuthResponse => {
-  const [loading, setLoading] = useState<boolean>(false)
+  const [loading, setLoading] = useState<boolean>(true)
   const [data, setData] = useState<any>(null)
   const { current } = InstitutionsStore.useState()
   const navigate = useNavigate()
 
   const appInit = async () => {
-    setLoading(true)
     try {
       const res = await axios.get(permissionsEndpoint)
       const isAdmin = checkIsAdmin(res.data.user)
-
+      setLoading(false)
       setData(res.data)
+
       UserStore.update((s) => {
         s.username = res.data?.user?.username
         s.user = res.data?.user
@@ -143,17 +142,13 @@ const useAuth = ({
 
       InstitutionsStore.update((s) => {
         s.institutions = res.data?.institutions
-        s.current = res.data?.institutions.find(
-          (item) => item.code === Cookies.get('campx_institution'),
-        )
+        s.current = res.data?.institutions[0]
       })
 
       AssetsStore.update((s) => {
         s.logo = res.data?.assets.logo
         s.logo_square = res.data?.assets.logo_square
       })
-
-      setLoading(false)
     } catch (err: any) {
       setLoading(false)
       const origin = window.location.origin
@@ -176,10 +171,11 @@ const useAuth = ({
       }
     }
   }
-
+  console.log(loading, !data?.permissions, !current, 'abc1')
   useEffect(() => {
     appInit()
   }, [])
+  console.log(loading, !data?.permissions, !current, 'abc2')
 
   return {
     loading: loading || !data?.permissions || !current,