@campxdev/shared 1.11.73 → 2.0.1

package/package.json

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

package/src/components/ErrorBoundary/ErrorFallback.tsx

@@ -1,6 +1,7 @@
 import { Alert, Box, Button, styled, Typography } from '@mui/material'
 import Cookies from 'js-cookie'
-import { useEffect, useState } from 'react'
+import { useState } from 'react'
+import { useNavigate } from 'react-router-dom'
 import {
   internalserver,
   nointernet,
@@ -11,7 +12,6 @@ import {
 import axios from '../../config/axios'
 import { openRootModal } from '../../contexts/RootModal'
 import { PermissionsStore } from '../../shared-state'
-import { useModal } from '../DrawerWrapper/DrawerWrapper'
 
 const StyledAlert = styled(Alert)(({ theme }) => ({
   height: '60px',
@@ -26,13 +26,12 @@ const StyledAlert = styled(Alert)(({ theme }) => ({
   },
   position: 'relative',
   '& .retryBtn': {
-    color: '#661b2a',
+    color: '#661B2A',
     position: 'absolute',
     right: 8,
     top: 8,
   },
 }))
-
 const StyledBox = styled(Box)(({ theme }) => ({
   width: '100%',
   display: 'flex',
@@ -40,32 +39,26 @@ const StyledBox = styled(Box)(({ theme }) => ({
   alignItems: 'center',
   justifyContent: 'center',
 }))
-
 export default function ErrorFallback({ error, resetErrorBoundary }) {
   if (error?.response?.status) {
     switch (error?.response?.status) {
       case 401:
         return <UnAuth resetBoundary={resetErrorBoundary} />
-
       case 500:
         return (
           <InternalServer resetBoundary={resetErrorBoundary} error={error} />
         )
-
       case 403:
         return <PemissionDenied resetBoundary={resetErrorBoundary} />
-
       default:
         return (
           <InternalServer resetBoundary={resetErrorBoundary} error={error} />
         )
     }
   }
-
   if (error?.message === 'Network Error') {
     return <NoInternet resetBoundary={resetErrorBoundary} />
   }
-
   return (
     <Box sx={{ marginTop: '16px', padding: '20px' }}>
       <StyledAlert severity="error">
@@ -83,7 +76,6 @@ export default function ErrorFallback({ error, resetErrorBoundary }) {
     </Box>
   )
 }
-
 export function PageNotFound({ resetBoundary }) {
   return (
     <>
@@ -102,7 +94,6 @@ export function PageNotFound({ resetBoundary }) {
     </>
   )
 }
-
 export function NoInternet({ resetBoundary }) {
   return (
     <>
@@ -116,7 +107,6 @@ export function NoInternet({ resetBoundary }) {
     </>
   )
 }
-
 export function PemissionDenied({ resetBoundary }) {
   return (
     <>
@@ -130,7 +120,6 @@ export function PemissionDenied({ resetBoundary }) {
     </>
   )
 }
-
 export function InternalServer({ resetBoundary, error }) {
   return (
     <>
@@ -158,20 +147,18 @@ export function InternalServer({ resetBoundary, error }) {
     </>
   )
 }
-
 export function UnAuth({ resetBoundary }) {
-  const modal = useModal()
+  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
@@ -194,7 +181,7 @@ export function UnAuth({ resetBoundary }) {
         })
       })
   }
-  function LoginPage() {
+  function handleLoginClick() {
     if (isDevelopment) {
       if (!sessionCookie) {
         openRootModal({
@@ -204,20 +191,9 @@ export function UnAuth({ resetBoundary }) {
         appinit()
       }
     } else {
-      if (!sessionCookie) {
-        window.location.replace(`https://www.id.campx.in/?redirect_to=${url}`)
-      } else {
-        appinit()
-      }
+      navigate('/auth/login')
     }
   }
-
-  useEffect(() => {
-    if (!isDevelopment && !isSetup) {
-      window.location.replace(`https://www.id.campx.in/?redirect_to=${url}`)
-    }
-  }, [isDevelopment])
-
   return (
     <>
       <StyledBox>
@@ -238,8 +214,7 @@ export function UnAuth({ resetBoundary }) {
           >
             Try Again
           </Button>
-
-          <Button onClick={() => LoginPage()}>Click here to Login</Button>
+          <Button onClick={handleLoginClick}>Click here to Login</Button>
         </Box>
       </StyledBox>
     </>

package/src/components/LoginForm.tsx

@@ -23,6 +23,7 @@ import ActionButton from './ActionButton'
 import { FormTextField } from './HookForm'
 import Image from './Image/Image'
 import ResetPassword from './ResetPassword'
+const isDevelopment = process.env.NODE_ENV == 'development'
 
 export function LoginForm({
   loginUrl,
@@ -61,12 +62,14 @@ export function LoginForm({
           ...deviceState.deviceInformation,
         },
       })
-      Cookies.remove('campx_session_key')
-      Cookies.remove('campx_tenant')
-      Cookies.remove('campx_institution')
-      Cookies.set('campx_session_key', res.data?.token)
-      Cookies.set('campx_tenant', res.data?.subDomain)
-      Cookies.set('campx_institution', res.data?.institutionCode)
+      if (isDevelopment) {
+        Cookies.remove('campx_session_key')
+        Cookies.remove('campx_tenant')
+        Cookies.remove('campx_institution')
+        Cookies.set('campx_session_key', res.data?.token)
+        Cookies.set('campx_tenant', res.data?.subDomain)
+        Cookies.set('campx_institution', res.data?.institutionCode)
+      }
       window.location.href = `/${res.data.institutionCode}`
       //window.location.reload()
     } catch (err) {

package/src/config/axios.ts

@@ -5,15 +5,11 @@ import { NetworkStore } from '../components/ErrorBoundary/GlobalNetworkLoadingIn
 
 const isDevelopment = process.env.NODE_ENV == 'development'
 
-const sessionKey = Cookies.get('campx_session_key')
 const tenantCode = isDevelopment
   ? Cookies.get('campx_tenant')
   : window.location.hostname.split('.')[0]
 const institutionCode = window.location.pathname.split('/')[1]
 
-const openPaymentsKey = Cookies.get('campx_open_payments_key')
-console.log(openPaymentsKey)
-
 export const formatParams = (params) => {
   return Object.fromEntries(
     Object.entries(params ?? {})?.map((i) => [
@@ -29,10 +25,6 @@ let axios = Axios.create({
   headers: {
     'x-tenant-id': tenantCode,
     'x-institution-code': institutionCode,
-    campx_session_key: sessionKey,
-    ...(openPaymentsKey && {
-      campx_open_payments_key: openPaymentsKey,
-    }),
   },
 })
 
@@ -42,7 +34,21 @@ axios.interceptors.request.use(
     NetworkStore.update((s) => {
       s.loading = true
     })
-    return { ...config, params }
+    const sessionKey = Cookies.get('campx_session_key')
+    const openPaymentsKey = Cookies.get('campx_open_payments_key')
+
+    if (isDevelopment && sessionKey) {
+      config.headers.set('campx_session_key', sessionKey)
+    }
+
+    if (openPaymentsKey) {
+      config.headers.set('campx_open_payments_key', openPaymentsKey)
+    }
+
+    return {
+      ...config,
+      params,
+    }
   },
   function (error) {
     NetworkStore.update((s) => {

package/src/contexts/Providers.tsx

@@ -20,7 +20,9 @@ export const urlTenantKey = isDevelopment
   ? Cookies.get('campx_tenant')
   : window.location.hostname.split('.')[0]
 export const instituitionKey =
-  Cookies.get('campx_institution') ?? window.location.pathname.split('/')[1]
+  window.location.pathname.split('/')[1] != ''
+    ? window.location.pathname.split('/')[1]
+    : Cookies.get('campx_institution')
 
 export default function Providers({ children }: { children: ReactNode }) {
   var baseName = '/'

package/src/hooks/useAuth.ts

@@ -171,11 +171,10 @@ const useAuth = ({
       }
     }
   }
-  console.log(loading, !data?.permissions, !current, 'abc1')
+
   useEffect(() => {
     appInit()
   }, [])
-  console.log(loading, !data?.permissions, !current, 'abc2')
 
   return {
     loading: loading || !data?.permissions || !current,