@campxdev/shared 1.11.32-alpha.1 → 1.11.32-alpha.10

package/package.json

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

package/src/components/Institutions/InsititutionsDialog.tsx

@@ -32,12 +32,9 @@ export default function InstitutionsDialog({ close }) {
 }
 
 const InstitutionCard = ({ institution }) => {
-  const urlTenantKey = window.location.pathname.split('/')[1]
   const handleClick = () => {
     localStorage.setItem('institution_key', institution?.code)
-    window.location.replace(
-      `${window.location.origin}/${urlTenantKey}/${institution?.code}`,
-    )
+    window.location.replace(`${window.location.origin}/${institution?.code}`)
   }
 
   return (

package/src/components/Institutions/InstitutionsDropdown.tsx

@@ -1,4 +1,3 @@
-import { urlTenantKey } from '../../contexts/Providers'
 import { InstitutionsStore } from '../../shared-state/InstitutionsStore'
 import { SearchSingleSelect } from '../Input/SearchSingleSelect'
 
@@ -8,9 +7,7 @@ export default function SchoolSwitch() {
   const handleChange = (value) => {
     if (value) {
       localStorage.setItem('institution_key', value?.value)
-      window.location.replace(
-        `${window.location.origin}/${urlTenantKey}/${value?.value}`,
-      )
+      window.location.replace(`${window.location.origin}/${value?.value}`)
     }
   }
   const options =

package/src/components/LoginForm.tsx

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

package/src/config/axios.ts

@@ -6,8 +6,8 @@ import { isDevelopment, isSetup } from '../constants'
 import { InstitutionsStore } from '../shared-state/InstitutionsStore'
 
 const sessionKey = Cookies.get('campx_session_key')
-const clientId = window.location.origin.split('.')[0] ?? 'campx_dev'
-const institutionId = window.location.pathname.split('/')[2] ?? 'campx_dev'
+const clientId = window.location.hostname.split('.')[0] ?? 'campx_dev'
+const institutionId = window.location.pathname.split('/')[1] ?? 'campx_dev'
 const openPaymentsKey = Cookies.get('campx_open_payments_key')
 
 export const formatParams = (params) => {

package/src/contexts/Providers.tsx

@@ -9,14 +9,19 @@ import { ToastContainer } from '../components'
 import DialogProvider from '../components/DrawerWrapper/DrawerWrapper'
 import GlobalNetworkLoadingIndicator from '../components/ErrorBoundary/GlobalNetworkLoadingIndicator'
 import ErrorModalProvider from '../components/ErrorModalWrapper/ErrorModalWrapper'
-import { isDevelopment } from '../constants'
 import RootModal from './RootModal'
 
 export const campxTenantKey = Cookies.get('campx_tenant')
-export const urlTenantKey = window.location.pathname.split('/')[1]
-export const instituitionKey = window.location.pathname.split('/')[2]
+export const urlTenantKey = window.location.hostname.split('.')[0]
+export const instituitionKey = window.location.pathname.split('/')[1]
 
-export default function Providers({ children }: { children: ReactNode }) {
+export default function Providers({
+  children,
+  module,
+}: {
+  children: ReactNode
+  module?: string
+}) {
   const localInstituitionKey = localStorage.getItem('institution_key')
 
   const getInstituitionKey = () => {
@@ -33,29 +38,30 @@ export default function Providers({ children }: { children: ReactNode }) {
   }
 
   useEffect(() => {
-    if (!urlTenantKey) {
-      if (isDevelopment) {
-        window.location.replace(window.location.origin + `/aupulse`)
-      }
-      if (campxTenantKey)
-        window.location.replace(window.location.origin + `/${campxTenantKey}`)
-    } else {
-      if (!instituitionKey) {
-        if (localInstituitionKey) {
+    console.log(instituitionKey, localInstituitionKey)
+    if (!instituitionKey) {
+      if (localInstituitionKey) {
+        if (module) {
+          window.location.replace(
+            window.location.origin + `/${localInstituitionKey}/${module}`,
+          )
+        } else {
           window.location.replace(
-            window.location.origin + `/${urlTenantKey}/${localInstituitionKey}`,
+            window.location.origin + `/${localInstituitionKey}`,
           )
         }
       }
     }
   }, [])
 
-  const baseName = getInstituitionKey()
-    ? `${urlTenantKey}/${getInstituitionKey()}`
-    : urlTenantKey
+  const defaultBaseName = getInstituitionKey()
+    ? module
+      ? `${getInstituitionKey()}/${module}`
+      : `${getInstituitionKey()}`
+    : ''
 
   return (
-    <BrowserRouter basename={baseName}>
+    <BrowserRouter basename={defaultBaseName}>
       <QueryClientProvider>
         <MuiThemeProvider>
           <ConfirmContextProvider>

package/src/hooks/useAuth.ts

@@ -3,7 +3,6 @@ import { useEffect, useState } from 'react'
 import { toast } from 'react-toastify'
 import axios from '../config/axios'
 import { isDevelopment } from '../constants'
-import { urlTenantKey } from '../contexts/Providers'
 import { openRootModal } from '../contexts/RootModal'
 import { AssetsStore, PermissionsStore, UserStore } from '../shared-state'
 import { InstitutionsStore } from '../shared-state/InstitutionsStore'
@@ -64,7 +63,7 @@ const checkIsAdmin = (user) => {
   return isAdmin ? 1 : 0
 }
 const getInstitutionKey = () => {
-  const instituitionKey = window.location.pathname.split('/')[2]
+  const instituitionKey = window.location.pathname.split('/')[1]
   if (!instituitionKey) {
     const localInstituitionKey = localStorage.getItem('institution_key')
     if (localInstituitionKey) {
@@ -91,12 +90,12 @@ function handleInstitutions(institutions) {
   if (institutions?.length === 1) {
     if (!insititutionKey) {
       window.location.replace(
-        `${window.location.origin}/${urlTenantKey}/${institutions[0]?.code}`,
+        `${window.location.origin}/${institutions[0]?.code}`,
       )
     }
     if (insititutionKey !== institutions[0]?.code) {
       window.location.replace(
-        `${window.location.origin}/${urlTenantKey}/${institutions[0]?.code}`,
+        `${window.location.origin}/${institutions[0]?.code}`,
       )
     }
     InstitutionsStore.update((s) => {