Merge pull request Expensify#50800 from software-mansion-labs/war-in/…

…enable-hybrid-app-copilot Enable copilot in HybridApp
pasyukevich · Nov 12, 2024 · 8a1052a · 8a1052a
2 parents 5e52372 + 43012b5
commit 8a1052a
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 7 deletions.
diff --git a/src/libs/actions/Delegate.ts b/src/libs/actions/Delegate.ts
@@ -1,3 +1,4 @@
+import {NativeModules} from 'react-native';
 import Onyx from 'react-native-onyx';
 import type {OnyxUpdate} from 'react-native-onyx';
 import * as API from '@libs/API';
@@ -6,6 +7,7 @@ import {SIDE_EFFECT_REQUEST_COMMANDS, WRITE_COMMANDS} from '@libs/API/types';
 import * as ErrorUtils from '@libs/ErrorUtils';
 import Log from '@libs/Log';
 import * as NetworkStore from '@libs/Network/NetworkStore';
+import {getCurrentUserEmail} from '@libs/Network/NetworkStore';
 import * as SequentialQueue from '@libs/Network/SequentialQueue';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -107,6 +109,8 @@ function connect(email: string) {
                     NetworkStore.setAuthToken(response?.restrictedToken ?? null);
                     confirmReadyToOpenApp();
                     openApp();
+
+                    NativeModules.HybridAppModule.switchAccount(email);
                 });
         })
         .catch((error) => {
@@ -170,6 +174,8 @@ function disconnect() {
                     NetworkStore.setAuthToken(response?.authToken ?? null);
                     confirmReadyToOpenApp();
                     openApp();
+
+                    NativeModules.HybridAppModule.switchAccount(getCurrentUserEmail() ?? '');
                 });
         })
         .catch((error) => {
@@ -607,4 +613,5 @@ export {
     clearDelegateRolePendingAction,
     updateDelegateRole,
     removeDelegate,
+    KEYS_TO_PRESERVE_DELEGATE_ACCESS,
 };
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
@@ -41,6 +41,7 @@ import Timers from '@libs/Timers';
 import {hideContextMenu} from '@pages/home/report/ContextMenu/ReportActionContextMenu';
 import {KEYS_TO_PRESERVE, openApp} from '@userActions/App';
 import * as App from '@userActions/App';
+import {KEYS_TO_PRESERVE_DELEGATE_ACCESS} from '@userActions/Delegate';
 import * as Device from '@userActions/Device';
 import * as PriorityMode from '@userActions/PriorityMode';
 import redirectToSignIn from '@userActions/SignInRedirect';
@@ -483,13 +484,24 @@ function signUpUser() {
 function signInAfterTransitionFromOldDot(transitionURL: string) {
     const [route, queryParams] = transitionURL.split('?');
 
-    const {email, authToken, encryptedAuthToken, accountID, autoGeneratedLogin, autoGeneratedPassword, clearOnyxOnStart, completedHybridAppOnboarding, isSingleNewDotEntry, primaryLogin} =
-        Object.fromEntries(
-            queryParams.split('&').map((param) => {
-                const [key, value] = param.split('=');
-                return [key, value];
-            }),
-        );
+    const {
+        email,
+        authToken,
+        encryptedAuthToken,
+        accountID,
+        autoGeneratedLogin,
+        autoGeneratedPassword,
+        clearOnyxOnStart,
+        completedHybridAppOnboarding,
+        isSingleNewDotEntry,
+        primaryLogin,
+        shouldRemoveDelegatedAccess,
+    } = Object.fromEntries(
+        queryParams.split('&').map((param) => {
+            const [key, value] = param.split('=');
+            return [key, value];
+        }),
+    );
 
     const clearOnyxForNewAccount = () => {
         if (clearOnyxOnStart !== 'true') {
@@ -501,6 +513,12 @@ function signInAfterTransitionFromOldDot(transitionURL: string) {
 
     const setSessionDataAndOpenApp = new Promise<Route>((resolve) => {
         clearOnyxForNewAccount()
+            .then(() => {
+                if (!shouldRemoveDelegatedAccess) {
+                    return;
+                }
+                return Onyx.clear(KEYS_TO_PRESERVE_DELEGATE_ACCESS);
+            })
             .then(() =>
                 Onyx.multiSet({
                     [ONYXKEYS.SESSION]: {email, authToken, encryptedAuthToken: decodeURIComponent(encryptedAuthToken), accountID: Number(accountID)},

diff --git a/src/types/modules/react-native.d.ts b/src/types/modules/react-native.d.ts
@@ -8,6 +8,7 @@ import type StartupTimer from '@libs/StartupTimer/types';
 type HybridAppModule = {
     closeReactNativeApp: (shouldSignOut: boolean, shouldSetNVP: boolean) => void;
     completeOnboarding: (status: boolean) => void;
+    switchAccount: (newDotCurrentAccount: string) => void;
     exitApp: () => void;
 };