Removed auth status check experiment

pkirilin · Jan 20, 2024 · 9365b84 · 9365b84
1 parent 21be80e
commit 9365b84
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 48 deletions.
diff --git a/src/frontend/src/authStatusCheck.ts b/src/frontend/src/authStatusCheck.ts
diff --git a/src/frontend/src/features/auth/hooks/useAuth.ts b/src/frontend/src/features/auth/hooks/useAuth.ts
@@ -22,7 +22,13 @@ interface UseAuthHookResult {
 export default function useAuth(): UseAuthHookResult {
   const user = useAppSelector(state => state.auth.user);
   const dispatch = useAppDispatch();
-  const [getAuthStatus, getAuthStatusRequest] = authApi.useLazyGetStatusQuery();
+
+  const { refetch, isFetching } = authApi.useGetStatusQuery(
+    {},
+    {
+      skip: !!user,
+    },
+  );
 
   const signIn = useCallback(() => {
     dispatch(actions.signIn());
@@ -54,16 +60,16 @@ export default function useAuth(): UseAuthHookResult {
   }, [signOut]);
 
   const completeLogin = useCallback(() => {
-    void getAuthStatus({});
-  }, [getAuthStatus]);
+    void refetch();
+  }, [refetch]);
 
   const completeLogout = useCallback(() => {
-    void getAuthStatus({});
-  }, [getAuthStatus]);
+    void refetch();
+  }, [refetch]);
 
   return {
     user,
-    isLoggingIn: getAuthStatusRequest.isFetching,
+    isLoggingIn: isFetching,
     login,
     logout,
     completeLogin,

diff --git a/src/frontend/src/index.tsx b/src/frontend/src/index.tsx
@@ -3,8 +3,7 @@ import { initBrowserMockApi } from 'tests/mockApi';
 import { createRoot } from 'react-dom/client';
 import App from './App';
 import AppProvider from './AppProvider';
-import { initAuthUserState } from './authStatusCheck';
-import { FAKE_AUTH_ENABLED, GOOGLE_ANALYTICS_ENABLED, MSW_ENABLED } from './config';
+import { GOOGLE_ANALYTICS_ENABLED, MSW_ENABLED } from './config';
 import { initGoogleAnalytics } from './googleAnalytics';
 import store from './store';
 
@@ -17,10 +16,6 @@ void (async () => {
     initGoogleAnalytics();
   }
 
-  if (!FAKE_AUTH_ENABLED) {
-    await initAuthUserState(store);
-  }
-
   const container = document.getElementById('root') as HTMLElement;
   const root = createRoot(container);