wait for finished fetching

bcgov · Jan 7, 2025 · 1c50c83 · 1c50c83
1 parent 8ef53ba
commit 1c50c83
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/nextapp/shared/services/auth/auth-context.tsx b/src/nextapp/shared/services/auth/auth-context.tsx
@@ -35,7 +35,7 @@ export const AuthProvider: React.FC<AuthProviderProps> = ({ children }) => {
 
   const identityParam = providerPage ? 'identity=provider&' : '';
 
-  if (session.status == 'loading') {
+  if (session.status == 'loading' || session.isFetching) {
     return <></>;
   }
 

diff --git a/src/nextapp/shared/services/auth/use-session.ts b/src/nextapp/shared/services/auth/use-session.ts
@@ -8,6 +8,7 @@ export interface AuthFailedResponse {
 
 export interface UserSessionResult {
   isLoading: boolean;
+  isFetching: boolean;
   ok: boolean;
   maintenance: boolean;
   user?: UserData;
@@ -64,17 +65,18 @@ export const getSessionL = async (): Promise<SessionData> => {
 };
 
 export const useSession = (): UserSessionResult => {
-  const { data, status, error, isLoading, isStale, isIdle, isFetching, isError } = useQuery<SessionData, Error>(
+  const { data, status, error, isLoading, isFetching } = useQuery<SessionData, Error>(
     'user',
     getSessionL,
     {
       retry: false,
       refetchOnWindowFocus: true,
     }
   );
-  console.log(JSON.stringify(data), status, error, isError, isLoading, isIdle, isStale, isFetching);
+
   return {
     isLoading,
+    isFetching,
     ok: Boolean(data?.user),
     user: data?.user,
     maintenance: data?.maintenance,