Merge branch 'dev' into bugFix-sign-id

bcgov · Sep 24, 2024 · bbe006d · bbe006d
2 parents d98fa07 + abdc539
commit bbe006d
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 127 deletions.
diff --git a/app/src/components/security/RouteGuards.test.tsx b/app/src/components/security/RouteGuards.test.tsx
@@ -34,10 +34,6 @@ const nullAuthState = getMockAuthState({
       refresh: () => {
         // do nothing
       }
-    },
-    critterbaseUserWrapper: {
-      isLoading: false,
-      critterbaseUserUuid: 'fakeguid'
     }
   }
 });

diff --git a/app/src/contexts/authStateContext.tsx b/app/src/contexts/authStateContext.tsx
@@ -1,4 +1,3 @@
-import { default as useCritterbaseUserWrapper } from 'hooks/useCritterbaseUserWrapper';
 import useSimsUserWrapper, { ISimsUserWrapper } from 'hooks/useSimsUserWrapper';
 import React from 'react';
 import { AuthContextProps, useAuth } from 'react-oidc-context';
@@ -18,13 +17,6 @@ export interface IAuthState {
    * @memberof IAuthState
    */
   simsUserWrapper: ISimsUserWrapper;
-  /**
-   * THe logged in user's Critterbase user information.
-   *
-   * @type {ReturnType<typeof useCritterbaseUserWrapper>}
-   * @memberof IAuthState
-   */
-  critterbaseUserWrapper: ReturnType<typeof useCritterbaseUserWrapper>;
 }
 
 export const AuthStateContext = React.createContext<IAuthState | undefined>(undefined);
@@ -46,14 +38,11 @@ export const AuthStateContextProvider: React.FC<React.PropsWithChildren> = (prop
 
   const simsUserWrapper = useSimsUserWrapper();
 
-  const critterbaseUserWrapper = useCritterbaseUserWrapper(simsUserWrapper);
-
   return (
     <AuthStateContext.Provider
       value={{
         auth,
-        simsUserWrapper,
-        critterbaseUserWrapper
+        simsUserWrapper
       }}>
       {props.children}
     </AuthStateContext.Provider>

diff --git a/app/src/hooks/cb_api/useAuthenticationApi.test.tsx b/app/src/hooks/cb_api/useAuthenticationApi.test.tsx
diff --git a/app/src/hooks/cb_api/useAuthenticationApi.tsx b/app/src/hooks/cb_api/useAuthenticationApi.tsx
diff --git a/app/src/hooks/useCritterbaseApi.ts b/app/src/hooks/useCritterbaseApi.ts
@@ -2,7 +2,6 @@ import { useXrefApi } from 'hooks/cb_api/useXrefApi';
 import { useConfigContext } from 'hooks/useContext';
 import { useMemo } from 'react';
 import useAxios from './api/useAxios';
-import { useAuthentication } from './cb_api/useAuthenticationApi';
 import { useCaptureApi } from './cb_api/useCaptureApi';
 import { useCollectionUnitApi } from './cb_api/useCollectionUnitApi';
 import { useCritterApi } from './cb_api/useCritterApi';
@@ -22,8 +21,6 @@ export const useCritterbaseApi = () => {
 
   const critters = useCritterApi(apiAxios);
 
-  const authentication = useAuthentication(apiAxios);
-
   const lookup = useLookupApi(apiAxios);
 
   const xref = useXrefApi(apiAxios);
@@ -41,7 +38,6 @@ export const useCritterbaseApi = () => {
   return useMemo(
     () => ({
       critters,
-      authentication,
       lookup,
       xref,
       marking,

diff --git a/app/src/hooks/useCritterbaseUserWrapper.tsx b/app/src/hooks/useCritterbaseUserWrapper.tsx
diff --git a/app/src/test-helpers/auth-helpers.ts b/app/src/test-helpers/auth-helpers.ts
@@ -33,10 +33,6 @@ export const UnauthenticatedUserAuthState: IAuthState = {
     refresh: () => {
       // do nothing
     }
-  },
-  critterbaseUserWrapper: {
-    isLoading: false,
-    critterbaseUserUuid: 'fakeguid'
   }
 };
 
@@ -73,10 +69,6 @@ export const SystemUserAuthState: IAuthState = {
     refresh: () => {
       // do nothing
     }
-  },
-  critterbaseUserWrapper: {
-    isLoading: false,
-    critterbaseUserUuid: 'fakeguid'
   }
 };
 
@@ -113,10 +105,6 @@ export const SystemAdminAuthState: IAuthState = {
     refresh: () => {
       // do nothing
     }
-  },
-  critterbaseUserWrapper: {
-    isLoading: false,
-    critterbaseUserUuid: 'fakeguid'
   }
 };
 
@@ -144,10 +132,6 @@ export const getMockAuthState = (options: { base: IAuthState; overrides?: Subset
     simsUserWrapper: {
       ...base.simsUserWrapper,
       ...overrides?.simsUserWrapper
-    },
-    critterbaseUserWrapper: {
-      ...base.simsUserWrapper,
-      ...overrides?.critterbaseUserWrapper
     }
   } as unknown as IAuthState;
 };