Merge pull request #564 from lifeomic/fix-set-login-flag

fix: set initial login flag so it gets set if already logged in
lifeomic · May 29, 2024 · ee88f56 · ee88f56
2 parents efc6c37 + 7a989a3
commit ee88f56
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/common/LoggedInProviders.tsx b/src/common/LoggedInProviders.tsx
@@ -17,6 +17,7 @@ import { ActivityIndicatorView } from '../components/ActivityIndicatorView';
 import { InviteProvider } from '../components/Invitations/InviteProvider';
 import { t } from 'i18next';
 import AppConfigSwitcher from '../components/AppConfigSwitcher';
+import { useStoredValue } from '../hooks/useStoredValue';
 
 export type LoggedInProvidersProps = {
   children?: React.ReactNode;
@@ -27,6 +28,8 @@ const LoggedOutStack = createNativeStackNavigator<NotLoggedInRootParamList>();
 export const LoggedInProviders = ({ children }: LoggedInProvidersProps) => {
   const auth = useAuth();
   const { pushNotificationsConfig } = useDeveloperConfig();
+  const [priorLoginDetected, setLoginDetected] =
+    useStoredValue('loginDetected');
 
   if (!auth.isLoggedIn && auth.loading) {
     return (
@@ -50,6 +53,10 @@ export const LoggedInProviders = ({ children }: LoggedInProvidersProps) => {
     );
   }
 
+  if (!priorLoginDetected) {
+    setLoginDetected('detected');
+  }
+
   return (
     <InviteProvider>
       <ActiveProjectContextProvider>

diff --git a/src/hooks/useOAuthFlow.tsx b/src/hooks/useOAuthFlow.tsx
@@ -17,7 +17,6 @@ import { usePendingInvite } from '../components/Invitations/InviteProvider';
 import { useQueryClient } from '@tanstack/react-query';
 import { _sdkAnalyticsEvent } from '../common/Analytics';
 import { useDeveloperConfig } from './useDeveloperConfig';
-import { useStoredValue } from './useStoredValue';
 
 export interface OAuthConfig {
   login: (params: LoginParams) => Promise<void>;
@@ -79,7 +78,6 @@ export const OAuthContextProvider = ({
   const pendingInvite = usePendingInvite();
   const queryClient = useQueryClient();
   const { skipInviteParams } = useDeveloperConfig();
-  const [_, setLoginDetected] = useStoredValue('loginDetected');
 
   const authConfig = useMemo(
     () =>
@@ -161,7 +159,6 @@ export const OAuthContextProvider = ({
       try {
         const result = await authorize(authConfig);
         await storeAuthResult(result);
-        setLoginDetected('detected');
         _sdkAnalyticsEvent.track('Login', { usedInvite: !!pendingInvite?.evc });
         onSuccess?.(result);
       } catch (error) {
@@ -173,13 +170,7 @@ export const OAuthContextProvider = ({
         onFail?.(error);
       }
     },
-    [
-      authConfig,
-      clearAuthResult,
-      pendingInvite?.evc,
-      setLoginDetected,
-      storeAuthResult,
-    ],
+    [authConfig, clearAuthResult, pendingInvite?.evc, storeAuthResult],
   );
 
   const refreshHandler = useCallback(