@campxdev/shared 1.11.7-0.alpha.51 → 1.11.7-0.alpha.52

package/package.json

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

package/src/hooks/useAuth.ts

@@ -1,5 +1,7 @@
 import { AxiosError } from 'axios'
+import Cookies from 'js-cookie'
 import { useEffect, useState } from 'react'
+import { useNavigate } from 'react-router-dom'
 import { toast } from 'react-toastify'
 import axios from '../config/axios'
 import { isDevelopment } from '../constants'
@@ -102,12 +104,12 @@ const loginErrorHandler = ({
   setLoading?: any
   err: AxiosError
 }) => {
+  const navigate = useNavigate()
   setLoading && setLoading(false)
   const origin = window.location.origin
   const isStaging = origin.split('campx')[1] === '.dev'
-  const isSetup = window.location.hostname.split('.').includes('setup')
 
-  if (isDevelopment || isStaging || isSetup) {
+  if (isDevelopment || isStaging) {
     openRootModal({
       key: 'login',
       contentData: {
@@ -120,15 +122,7 @@ const loginErrorHandler = ({
     })
     return
   } else {
-    window.location.replace(`https://www.id.campx.in/?redirect_to=${url}`)
-  }
-
-  if (err.response.status !== 401) {
-    if (err.response.status > 400 && err.response.status < 500) {
-      window.location.replace(`https://www.id.campx.in/?redirect_to=${url}`)
-    } else {
-      toast.error('Server Error')
-    }
+    navigate('/auth/login')
   }
 }
 
@@ -142,30 +136,7 @@ function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
     axios
       .get(permissionsEndpoint)
       .then((res) => {
-        const origin = window.location.origin
-        const originSubdomain =
-          window.location.host.split('.')?.slice(-3)[0] ?? 'ums'
-        const isStaging = origin.split('campx')[1] === '.dev'
         const isAdmin = checkIsAdmin(res.data.user)
-        const isSetup =
-          window.location.hostname.split('.').includes('setup') && isAdmin
-        const isMasterSlave = res.data?.institutionType === 'MASTER_CHILD'
-
-        // eslint-disable-next-line no-console
-
-        if (isDevelopment == false && isStaging == false && !isSetup) {
-          if (
-            !res.data.applications.includes(ApplicationObj[originSubdomain])
-          ) {
-            window.location.replace(
-              `https://www.id.campx.in/apps?redirect_to=${url}`,
-            )
-          }
-        }
-
-        if (res.data?.institutions) {
-          handleInstitutions(res.data?.institutions)
-        }
 
         setData(res.data)
         UserStore.update((s) => {
@@ -198,6 +169,14 @@ function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
           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'),
+          )
+        })
+
         AssetsStore.update((s) => {
           s.logo = res.data?.assets.logo
           s.logo_square = res.data?.assets.logo_square