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

package/package.json

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

package/src/components/LoginForm.tsx

@@ -62,7 +62,9 @@ export function LoginForm({
         },
       })
       Cookies.set('campx_session_key', res.data?.token)
-      window.location.href = `/${res.data.subDomain}/${res.data.institutionCode}`
+      Cookies.set('campx_tenant', res.data?.subDomain)
+      Cookies.set('campx_institution', res.data?.institutionCode)
+      window.location.href = `/${res.data.institutionCode}`
       //window.location.reload()
     } catch (err) {
       // eslint-disable-next-line no-console

package/src/config/axios.ts

@@ -7,11 +7,9 @@ const isDevelopment = process.env.NODE_ENV == 'development'
 
 const sessionKey = Cookies.get('campx_session_key')
 const tenantCode = isDevelopment
-  ? window.location.pathname.split('/')[1]
+  ? Cookies.get('campx_tenant')
   : window.location.hostname.split('.')[0]
-const institutionCode = isDevelopment
-  ? window.location.pathname.split('/')[2]
-  : window.location.pathname.split('/')[1]
+const institutionCode = window.location.pathname.split('/')[1]
 
 const openPaymentsKey = Cookies.get('campx_open_payments_key')
 

package/src/contexts/Providers.tsx

@@ -14,51 +14,38 @@ import RootModal from './RootModal'
 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')
+  ? Cookies.get('campx_tenant')
+  : window.location.hostname.split('.')[0]
 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]
+  ? Cookies.get('campx_tenant')
+  : window.location.hostname.split('.')[0]
+export const instituitionKey =
+  window.location.pathname.split('/')[1] ?? Cookies.get('campx_institution')
 
 export default function Providers({ children }: { children: ReactNode }) {
-  const sessionKey = Cookies.get('campx_session_key')
   var baseName = '/'
   var tenantCode
-  var institutionCode
+  var institutionCode =
+    window.location.pathname.split('/')[1] ?? Cookies.get('campx_institution')
 
   if (isDevelopment) {
-    tenantCode = window.location.pathname.split('/')[1]
-    institutionCode = window.location.pathname.split('/')[2]
+    tenantCode = Cookies.get('campx_tenant')
     if (
       tenantCode &&
       institutionCode &&
       window.location.pathname !== '/auth/login'
     ) {
-      baseName = `/${tenantCode}/${institutionCode}`
+      baseName = `/${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) {
+    if (location.pathname === '/' && institutionCode && tenantCode) {
       window.location.replace(window.location.origin + `/${institutionCode}`)
     }
   }, [])