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

package/package.json

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

package/src/components/LoginForm.tsx

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

package/src/config/axios.ts

@@ -3,14 +3,17 @@ import Cookies from 'js-cookie'
 import { toast } from 'react-toastify'
 import { NetworkStore } from '../components/ErrorBoundary/GlobalNetworkLoadingIndicator'
 
+const isDevelopment = process.env.NODE_ENV == 'development'
+
 const sessionKey = Cookies.get('campx_session_key')
-const tenantId =
-  Cookies.get('campx_tenant') ?? window.location.hostname.split('.')[0]
-const institutionId =
-  Cookies.get('campx_institution') ?? window.location.pathname.split('/')[1]
-const openPaymentsKey = Cookies.get('campx_open_payments_key')
+const tenantCode = isDevelopment
+  ? window.location.pathname.split('/')[1]
+  : window.location.hostname.split('.')[0]
+const institutionCode = isDevelopment
+  ? window.location.pathname.split('/')[2]
+  : window.location.pathname.split('/')[1]
 
-const isProduction = process.env.NODE_ENV === 'production'
+const openPaymentsKey = Cookies.get('campx_open_payments_key')
 
 export const formatParams = (params) => {
   return Object.fromEntries(
@@ -21,15 +24,16 @@ export const formatParams = (params) => {
   )
 }
 
-console.log(institutionId, sessionKey, 'test')
-
 let axios = Axios.create({
   baseURL: process.env.REACT_APP_API_HOST,
   withCredentials: true,
   headers: {
-    'x-tenant-id': tenantId,
-    'x-institution-code': institutionId,
+    'x-tenant-id': tenantCode,
+    'x-institution-code': institutionCode,
     campx_session_key: sessionKey,
+    ...(openPaymentsKey && {
+      campx_open_payments_key: openPaymentsKey,
+    }),
   },
 })
 

package/src/constants/isDevelopment.ts

@@ -1,5 +1,2 @@
-export const isDevelopment =
-  process.env.NODE_ENV === 'development' ||
-  window.location.origin.split('campx')[1] === '.dev'
-
+export const isDevelopment = process.env.NODE_ENV === 'development'
 export const isSetup = window.location.hostname.split('.').includes('setup')