Prevent OD api calls during SSO sign out

modules/hybrid-app/android/src/main/java/com/expensify/reactnativehybridapp/ReactNativeHybridApp.kt

@@ -70,4 +70,12 @@ class ReactNativeHybridApp(reactContext: ReactApplicationContext) :
     override fun clearOldDotAfterSignOut() {
       Log.d(NAME, "`clearOldDotAfterSignOut` should never be called in standalone `New Expensify` app")
     }
+
+    override fun startSignOut(){
+      Log.d(NAME, "`startSignOut` should never be called in standalone `New Expensify` app")
+    }
+
+    override fun cancelSignOut(){
+      Log.d(NAME, "`cancelSignOut` should never be called in standalone `New Expensify` app")
+    }    
 }

modules/hybrid-app/ios/ReactNativeHybridApp.mm

@@ -51,6 +51,14 @@ - (void)signOutFromOldDot {
     NSLog(@"[ReactNativeHybridApp] `signOutFromOldDot` should never be called in standalone `New Expensify` app");
 }
 
+- (void)startSignOut {
+    NSLog(@"[ReactNativeHybridApp] `startSignOut` should never be called in standalone `New Expensify` app");
+}
+
+- (void)cancelSignOut {
+    NSLog(@"[ReactNativeHybridApp] `cancelSignOut` should never be called in standalone `New Expensify` app");
+}
+
 - (void)clearOldDotAfterSignOut {
     NSLog(@"[ReactNativeHybridApp] `clearOldDotAfterSignOut` should never be called in standalone `New Expensify` app");
 }

modules/hybrid-app/src/NativeReactNativeHybridApp.ts

@@ -14,6 +14,8 @@ export interface Spec extends TurboModule {
     onURLListenerAdded: () => void;
     signInToOldDot: (autoGeneratedLogin: string, autoGeneratedPassword: string, authToken: string, email: string, policyID: string, signingInWithSAML?: boolean) => void;
     signOutFromOldDot: () => void;
+    startSignOut: () => void;
+    cancelSignOut: () => void;
     clearOldDotAfterSignOut: () => void;
 }
 

modules/hybrid-app/src/index.native.ts

@@ -35,6 +35,12 @@ const HybridAppModule: HybridAppModuleType = {
     signOutFromOldDot() {
         ReactNativeHybridApp.signOutFromOldDot();
     },
+    startSignOut() {
+        ReactNativeHybridApp.startSignOut();
+    },
+    cancelSignOut() {
+        ReactNativeHybridApp.cancelSignOut();
+    },
     clearOldDotAfterSignOut() {
         ReactNativeHybridApp.clearOldDotAfterSignOut();
     },

modules/hybrid-app/src/index.ts

@@ -46,6 +46,14 @@ const HybridAppModule: HybridAppModuleType = {
         // eslint-disable-next-line no-console
         console.warn('HybridAppModule: `signOutFromOldDot` should never be called on web');
     },
+    startSignOut() {
+        // eslint-disable-next-line no-console
+        console.warn('HybridAppModule: `startSignOut` should never be called on web');
+    },
+    cancelSignOut() {
+        // eslint-disable-next-line no-console
+        console.warn('HybridAppModule: `cancelSignOut` should never be called on web');
+    },
     clearOldDotAfterSignOut() {
         // eslint-disable-next-line no-console
         console.warn('HybridAppModule: `clearOldDotAfterSignOut` should never be called on web');

modules/hybrid-app/src/types.ts

@@ -10,6 +10,8 @@ type HybridAppModuleType = {
     onURLListenerAdded: () => void;
     signInToOldDot: (args: {autoGeneratedLogin: string; autoGeneratedPassword: string; authToken: string; email: string; policyID: string; signingInWithSAML?: boolean}) => void;
     signOutFromOldDot: () => void;
+    startSignOut: () => void;
+    cancelSignOut: () => void;
     clearOldDotAfterSignOut: () => void;
 };
 

src/libs/actions/Session/index.ts

@@ -79,7 +79,7 @@
 let isHybridAppSetupFinished = false;
 let hasSwitchedAccountInHybridMode = false;
 
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (value) => {
         session = value ?? {};
@@ -104,25 +104,25 @@
 });
 
 let stashedSession: Session = {};
 Onyx.connect({
     key: ONYXKEYS.STASHED_SESSION,
     callback: (value) => (stashedSession = value ?? {}),
 });
 
 let credentials: Credentials = {};
 Onyx.connect({
     key: ONYXKEYS.CREDENTIALS,
     callback: (value) => (credentials = value ?? {}),
 });
 
 let stashedCredentials: Credentials = {};
 Onyx.connect({
     key: ONYXKEYS.STASHED_CREDENTIALS,
     callback: (value) => (stashedCredentials = value ?? {}),
 });
 
 let activePolicyID: OnyxEntry<string>;
 Onyx.connect({
     key: ONYXKEYS.NVP_ACTIVE_POLICY_ID,
     callback: (newActivePolicyID) => {
         activePolicyID = newActivePolicyID;
@@ -265,6 +265,9 @@
         })
         .then((result) => {
             if (result && result.type !== 'success') {
+                if (CONFIG.IS_HYBRID_APP) {
+                    HybridAppModule.cancelSignOut();
+                }
                 return Promise.reject(Error('Logout cancelled'));
             }
             // We always want to sign out the user from the app
@@ -339,6 +342,10 @@
     const isSupportal = isSupportAuthToken();
     const shouldRestoreStashedSession = isSupportal || shouldForceUseStashedSession;
 
+    if (CONFIG.IS_HYBRID_APP && shouldSignOutFromOldDot) {
+        HybridAppModule.startSignOut();
+    }
+
     // We'll only call signOut if we're not stashing the session and not restoring a stashed session,
     // otherwise we'll call the API to invalidate the autogenerated credentials used for infinite
     // session.