@campxdev/shared 1.11.7-1.alpha.3 → 1.11.7-1.alpha.5

package/package.json

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

package/src/config/axios.ts

@@ -30,6 +30,9 @@ let axios = Axios.create({
     'x-tenant-id': tenantId,
     'x-institution-code': institutionId,
     campx_session_key: sessionKey,
+    ...(openPaymentsKey && {
+      campx_open_payments_key: openPaymentsKey,
+    }),
   },
 })
 

package/src/hooks/useAuth.ts

@@ -1,4 +1,3 @@
-import { AxiosError } from 'axios'
 import Cookies from 'js-cookie'
 import { useEffect, useState } from 'react'
 import { useNavigate } from 'react-router-dom'
@@ -77,7 +76,6 @@ const getInstitutionKey = () => {
     return instituitionKey
   }
 }
-const navigate = useNavigate()
 
 function handleInstitutions(institutions) {
   if (institutions?.length === 0) {
@@ -96,95 +94,87 @@ function handleInstitutions(institutions) {
   }
 }
 
-const loginErrorHandler = ({
+const useAuth = ({
+  permissionsEndpoint,
   loginUrl,
-  setLoading,
-  err,
-}: {
-  loginUrl: string
-  setLoading?: any
-  err: AxiosError
-}) => {
-  setLoading(false)
-
-  if (isDevelopment) {
-    openRootModal({
-      key: 'login',
-      contentData: {
-        loginUrl,
-      },
-      dialogProps: {
-        disableEscapeKeyDown: true,
-        onClose: () => {},
-      },
-    })
-    return
-  } else {
-    navigate('/auth/login')
-  }
-}
-
-function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
+}: AuthParams): AuthResponse => {
   const [loading, setLoading] = useState<boolean>(false)
-  const [data, setData] = useState(null)
+  const [data, setData] = useState<any>(null)
   const { current } = InstitutionsStore.useState()
+  const navigate = useNavigate()
 
   const appInit = async () => {
     setLoading(true)
-    axios
-      .get(permissionsEndpoint)
-      .then((res) => {
-        const isAdmin = checkIsAdmin(res.data.user)
-
-        setData(res.data)
-        UserStore.update((s) => {
-          s.username = res.data?.user?.username
-          s.user = res.data?.user
-          s.roles = res.data?.roles
-          s.globalUserId = res.data?.globalUserId
-          s.fullName = res.data?.fullName
-        })
-
-        PermissionsStore.update((s) => {
-          s.permissions = {
-            ...res.data?.permissions,
-            can_settings_view: 1,
-            can_dashboard_view: 1,
-            can_individual_pages_view: 1,
-            can_analatics_view: isAdmin,
-            can_admin_view: isAdmin,
-            can_my_mentees_view:
-              res.data?.user?.isMentor &&
-              res.data?.permissions.can_my_mentees_view,
-          } as any
-          s.applications = res.data?.applications ?? []
-          s.institutionType = res.data?.institutionType
-          s.masterInstitutionUniqueId = res.data?.masterInstitutionUniqueId
-          s.masterInstitutionId = res.data?.masterInstitutionId
-          s.isMasterInstitutionUser = res.data?.institutions
-            ?.map((institution) => institution?.id)
-            ?.includes(res?.data?.masterInstitutionUniqueId)
-          s.isMasterInstitution = res.data?.isMasterInstitution
-          s.isHomePageEnabled = res.data?.isHomePageEnabled
-        })
-
-        InstitutionsStore.update((s) => {
-          s.institutions = res.data?.institutions
-          s.current = res.data?.institutions.find(
-            (item) => item.code === Cookies.get('campx_institution'),
-          )
-        })
+    try {
+      const res = await axios.get(permissionsEndpoint)
+      const isAdmin = checkIsAdmin(res.data.user)
+
+      setData(res.data)
+      UserStore.update((s) => {
+        s.username = res.data?.user?.username
+        s.user = res.data?.user
+        s.roles = res.data?.roles
+        s.globalUserId = res.data?.globalUserId
+        s.fullName = res.data?.fullName
+      })
 
-        AssetsStore.update((s) => {
-          s.logo = res.data?.assets.logo
-          s.logo_square = res.data?.assets.logo_square
-        })
+      PermissionsStore.update((s) => {
+        s.permissions = {
+          ...res.data?.permissions,
+          can_settings_view: 1,
+          can_dashboard_view: 1,
+          can_individual_pages_view: 1,
+          can_analatics_view: isAdmin,
+          can_admin_view: isAdmin,
+          can_my_mentees_view:
+            res.data?.user?.isMentor &&
+            res.data?.permissions.can_my_mentees_view,
+        }
+        s.applications = res.data?.applications ?? []
+        s.institutionType = res.data?.institutionType
+        s.masterInstitutionUniqueId = res.data?.masterInstitutionUniqueId
+        s.masterInstitutionId = res.data?.masterInstitutionId
+        s.isMasterInstitutionUser = res.data?.institutions
+          ?.map((institution) => institution?.id)
+          ?.includes(res?.data?.masterInstitutionUniqueId)
+        s.isMasterInstitution = res.data?.isMasterInstitution
+        s.isHomePageEnabled = res.data?.isHomePageEnabled
+      })
 
-        setLoading(false)
+      InstitutionsStore.update((s) => {
+        s.institutions = res.data?.institutions
+        s.current = res.data?.institutions.find(
+          (item) => item.code === Cookies.get('campx_institution'),
+        )
       })
-      .catch((err: AxiosError) => {
-        loginErrorHandler({ loginUrl, setLoading, err })
+
+      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
+      const isStaging = origin.split('campx')[1] === '.dev'
+
+      if (isDevelopment || isStaging) {
+        openRootModal({
+          key: 'login',
+          contentData: {
+            loginUrl,
+          },
+          dialogProps: {
+            disableEscapeKeyDown: true,
+            onClose: () => {},
+          },
+        })
+        return
+      } else {
+        navigate('/auth/login')
+      }
+    }
   }
 
   useEffect(() => {