@campxdev/shared 2.0.1 → 2.0.3

package/package.json

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

package/src/components/ErrorBoundary/ErrorFallback.tsx

@@ -1,6 +1,4 @@
 import { Alert, Box, Button, styled, Typography } from '@mui/material'
-import Cookies from 'js-cookie'
-import { useState } from 'react'
 import { useNavigate } from 'react-router-dom'
 import {
   internalserver,
@@ -9,9 +7,7 @@ import {
   permissiondenied,
   unauth,
 } from '../../assets/images'
-import axios from '../../config/axios'
 import { openRootModal } from '../../contexts/RootModal'
-import { PermissionsStore } from '../../shared-state'
 
 const StyledAlert = styled(Alert)(({ theme }) => ({
   height: '60px',
@@ -149,47 +145,14 @@ export function InternalServer({ resetBoundary, error }) {
 }
 export function UnAuth({ resetBoundary }) {
   const navigate = useNavigate()
-  const [username, setUsername] = useState('')
-  const [loading, setLoading] = useState(false)
-  const url = window.location.origin
-  const origin = window?.location?.origin?.split('.')
-  const isDevelopment =
-    process.env.NODE_ENV === 'development' ||
-    origin?.slice(-2).join('.') === 'campx.dev'
-  console.log(isDevelopment, 'hii')
-  const isSetup = window.location.hostname.split('.').includes('setup')
-  const sessionCookie = Cookies.get('campx_session_key')
-  const appinit = async () => {
-    setLoading(true)
-    await axios
-      .get('/auth/my-permissions')
-      .then((res) => {
-        setUsername(res.data.user.fullName)
-        PermissionsStore.update((s) => {
-          s.permissions = {
-            ...res.data?.permissions,
-            can_settings_view: 1,
-            can_dashboard_view: 1,
-            can_individual_pages_view: 1,
-          } as any
-        })
-        setLoading(false)
-      })
-      .catch((e) => {
-        openRootModal({
-          key: 'login',
-        })
-      })
-  }
+
+  const isDevelopment = process.env.NODE_ENV === 'development'
+
   function handleLoginClick() {
     if (isDevelopment) {
-      if (!sessionCookie) {
-        openRootModal({
-          key: 'login',
-        })
-      } else {
-        appinit()
-      }
+      openRootModal({
+        key: 'login',
+      })
     } else {
       navigate('/auth/login')
     }

package/src/config/axios.ts

@@ -5,9 +5,10 @@ import { NetworkStore } from '../components/ErrorBoundary/GlobalNetworkLoadingIn
 
 const isDevelopment = process.env.NODE_ENV == 'development'
 
-const tenantCode = isDevelopment
-  ? Cookies.get('campx_tenant')
-  : window.location.hostname.split('.')[0]
+const tenantCode =
+  isDevelopment || window.location.hostname === 'localhost'
+    ? Cookies.get('campx_tenant')
+    : window.location.hostname.split('.')[0]
 const institutionCode = window.location.pathname.split('/')[1]
 
 export const formatParams = (params) => {