@campxdev/shared 1.11.7-0.alpha.36 → 1.11.7-0.alpha.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@campxdev/shared",
-  "version": "1.11.7-0.alpha.36",
+  "version": "1.11.7-0.alpha.38",
   "main": "./exports.ts",
   "scripts": {
     "start": "react-scripts start",
@@ -31,34 +31,33 @@
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
     "@hookform/resolvers": "^2.9.10",
-    "@mui/icons-material": "^5.15.18",
+    "@mongodb-js/charts-embed-dom": "3.2.1",
+    "@mui/icons-material": "^5.15.20",
     "@mui/lab": "^5.0.0-alpha.146",
-    "@mui/material": "^5.15.18",
+    "@mui/material": "^5.15.20",
     "@mui/x-date-pickers": "^6.16.0",
-    "axios": "^0.27.2",
+    "axios": "^1.7.2",
     "date-fns": "^2.28.0",
     "date-fns-tz": "^2.0.0",
     "device-detector-js": "^3.0.3",
     "fuse.js": "^6.6.2",
-    "js-cookie": "^3.0.1",
+    "js-cookie": "^3.0.5",
     "moment": "^2.29.4",
     "pullstate": "^1.24.0",
-    "react": "^18.2.0",
+    "react": "^18.3.1",
     "react-arrows": "^1.2.0",
-    "react-dom": "^18.2.0",
+    "react-dom": "^18.3.1",
     "react-error-boundary": "^3.1.4",
     "react-flatpickr": "^3.10.13",
     "react-helmet": "^6.1.0",
     "react-hook-form": "^7.40.0",
     "react-joyride": "^2.5.5",
-    "react-query": "^3.39.0",
-    "react-router-dom": "^6.4.2",
+    "react-query": "^3.39.3",
+    "react-router-dom": "^6.23.1",
     "react-table": "^7.8.0",
     "react-toastify": "^9.0.1",
     "styled-components": "^5.3.5",
-    "@mongodb-js/charts-embed-dom": "3.2.1",
     "swiper": "^8.1.5",
-    "typescript": "^5.2.2",
     "use-immer": "^0.8.1",
     "yup": "^0.32.11"
   },
@@ -73,9 +72,9 @@
     "@storybook/preset-create-react-app": "^4.0.0",
     "@storybook/react": "^6.5.14",
     "@storybook/testing-library": "^0.0.13",
-    "@types/js-cookie": "^3.0.2",
+    "@types/js-cookie": "^3.0.6",
     "@types/node": "^18.11.8",
-    "@types/react": "^18.0.25",
+    "@types/react": "^18.3.3",
     "@types/react-flatpickr": "^3.8.8",
     "@types/react-helmet": "^6.1.6",
     "@typescript-eslint/eslint-plugin": "^6.7.4",
@@ -89,7 +88,8 @@
     "eslint-plugin-storybook": "^0.6.8",
     "prettier": "^2.5.0",
     "react-scripts": "^5.0.1",
-    "storybook-addon-react-router-v6": "^0.2.1"
+    "storybook-addon-react-router-v6": "^0.2.1",
+    "typescript": "^5.5.2"
   },
   "resolutions": {
     "react-dev-utils/fork-ts-checker-webpack-plugin": "^6.5.3",

package/src/config/axios.ts

@@ -1,4 +1,4 @@
-import Axios, { AxiosRequestConfig } from 'axios'
+import Axios, { InternalAxiosRequestConfig } from 'axios'
 import Cookies from 'js-cookie'
 import { toast } from 'react-toastify'
 import { NetworkStore } from '../components/ErrorBoundary/GlobalNetworkLoadingIndicator'
@@ -34,7 +34,7 @@ let axios = Axios.create({
 })
 
 axios.interceptors.request.use(
-  function (config: AxiosRequestConfig) {
+  function (config: InternalAxiosRequestConfig) {
     const params = formatParams(config?.params)
     NetworkStore.update((s) => {
       s.loading = true

package/src/hooks/useAuth.ts

@@ -1,5 +1,4 @@
 import { AxiosError } from 'axios'
-import Cookies from 'js-cookie'
 import { useEffect, useState } from 'react'
 import { toast } from 'react-toastify'
 import axios from '../config/axios'
@@ -193,14 +192,23 @@ function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
           window.location.hostname.split('.').includes('setup') && isAdmin
         const isMasterSlave = res.data?.institutionType === 'MASTER_CHILD'
 
-        setData(res.data)
+        // eslint-disable-next-line no-console
 
-        InstitutionsStore.update((s) => {
-          s.institutions = res.data?.institutions
-          s.current = res.data?.institutions.find(
-            (item) => item.code === Cookies.get('campx_institution'),
-          )
-        })
+        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) => {
           s.username = res.data?.user?.username
           s.user = res.data?.user