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

package/package.json

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

package/src/hooks/useAuth.ts

@@ -95,37 +95,6 @@ function handleInstitutions(institutions) {
   }
 }
 
-const loginErrorHandler = ({
-  loginUrl,
-  setLoading,
-  err,
-}: {
-  loginUrl: string
-  setLoading?: any
-  err: AxiosError
-}) => {
-  const navigate = useNavigate()
-  setLoading && 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')
-  }
-}
-
 function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
   const [loading, setLoading] = useState<boolean>(false)
   const [data, setData] = useState(null)
@@ -185,7 +154,26 @@ function useAuth({ permissionsEndpoint, loginUrl }: AuthParams): AuthResponse {
         setLoading(false)
       })
       .catch((err: AxiosError) => {
-        loginErrorHandler({ loginUrl, setLoading, err })
+        const navigate = useNavigate()
+        setLoading && 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')
+        }
       })
   }