Reinitialize Pusher during delegate account transitions

src/libs/Navigation/AppNavigator/AuthScreensInitHandler.tsx

@@ -16,6 +16,8 @@ import Navigation from '@libs/Navigation/Navigation';
 import Pusher from '@libs/Pusher';
 import PusherConnectionManager from '@libs/PusherConnectionManager';
 import {getReportIDFromLink} from '@libs/ReportUtils';
+import {registerPusherReinitializeHandler} from '@libs/requestPusherReinitialize';
+import type {PusherReinitializeHandlerParams} from '@libs/requestPusherReinitialize';
 import * as SessionUtils from '@libs/SessionUtils';
 import {endSpan, getSpan, startSpan} from '@libs/telemetry/activeSpans';
 import {getSearchParamFromUrl} from '@libs/Url';
@@ -75,6 +77,23 @@ function AuthScreensInitHandler() {
 
     useReconcileHighContrastIntent();
 
+    useEffect(() => {
+        registerPusherReinitializeHandler(({accountID, email}: PusherReinitializeHandlerParams = {}) => {
+            const currentAccountID = accountID ?? session?.accountID;
+            const currentEmail = email ?? session?.email ?? '';
+
+            if (currentAccountID === undefined) {
+                return Promise.resolve();
+            }
+
+            return initializePusher(currentAccountID, currentEmail, () => reportAttributesRef.current);
+        });
+
+        return () => {
+            registerPusherReinitializeHandler(null);
+        };
+    }, [session?.accountID, session?.email]);
+
     useEffect(() => {
         if (!Navigation.isActiveRoute(ROUTES.SIGN_IN_MODAL)) {
             return;

src/libs/actions/Delegate.ts

@@ -14,6 +14,8 @@ import Log from '@libs/Log';
 import {clearPreservedSearchNavigatorStates} from '@libs/Navigation/AppNavigator/createSplitNavigator/usePreserveNavigatorState';
 import * as NetworkStore from '@libs/Network/NetworkStore';
 import * as SequentialQueue from '@libs/Network/SequentialQueue';
+import Pusher from '@libs/Pusher';
+import {requestPusherReinitialize} from '@libs/requestPusherReinitialize';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
 import ONYXKEYS from '@src/ONYXKEYS';
@@ -215,21 +217,24 @@ function connect({email, delegatedAccess, credentials, session, activePolicyID,
                 })
                 .then(() => {
                     NetworkStore.setAuthToken(response?.restrictedToken ?? null);
+                    Pusher.disconnect();
                     return clearOnyxForDelegateTransition();
                 })
                 .then(() => {
-                    return openApp().then(() => {
-                        if (!CONFIG.IS_HYBRID_APP || !policyID) {
+                    return openApp()
+                        .then(() => requestPusherReinitialize({accountID: response.accountID, email: response.email}))
+                        .then(() => {
+                            if (!CONFIG.IS_HYBRID_APP || !policyID) {
+                                return true;
+                            }
+                            HybridAppModule.switchAccount({
+                                newDotCurrentAccountEmail: email,
+                                authToken: restrictedToken,
+                                policyID,
+                                accountID: String(session?.accountID ?? CONST.DEFAULT_NUMBER_ID),
+                            });
                             return true;
-                        }
-                        HybridAppModule.switchAccount({
-                            newDotCurrentAccountEmail: email,
-                            authToken: restrictedToken,
-                            policyID,
-                            accountID: String(session?.accountID ?? CONST.DEFAULT_NUMBER_ID),
                         });
-                        return true;
-                    });
                 });
         })
         .catch((error) => {
@@ -313,6 +318,7 @@ function disconnect({stashedCredentials, stashedSession}: DisconnectParams) {
                 })
                 .then(() => {
                     NetworkStore.setAuthToken(response?.authToken ?? null);
+                    Pusher.disconnect();
                     return clearOnyxForDelegateTransition();
                 })
                 .then(() => {
@@ -322,17 +328,19 @@ function disconnect({stashedCredentials, stashedSession}: DisconnectParams) {
                     });
                     Onyx.set(ONYXKEYS.STASHED_CREDENTIALS, {});
                     Onyx.set(ONYXKEYS.STASHED_SESSION, {});
-                    openApp().then(() => {
-                        if (!CONFIG.IS_HYBRID_APP) {
-                            return;
-                        }
-                        HybridAppModule.switchAccount({
-                            newDotCurrentAccountEmail: requesterEmail,
-                            authToken,
-                            policyID: '',
-                            accountID: '',
+                    openApp()
+                        .then(() => requestPusherReinitialize({accountID: response.requesterID, email: requesterEmail}))
+                        .then(() => {
+                            if (!CONFIG.IS_HYBRID_APP) {
+                                return;
+                            }
+                            HybridAppModule.switchAccount({
+                                newDotCurrentAccountEmail: requesterEmail,
+                                authToken,
+                                policyID: '',
+                                accountID: '',
+                            });
                         });
-                    });
                 });
         })
         .catch((error) => {

src/libs/requestPusherReinitialize.ts

@@ -0,0 +1,26 @@
+import Log from './Log';
+
+type PusherReinitializeHandlerParams = {
+    accountID?: number;
+    email?: string;
+};
+
+type PusherReinitializeHandler = (params?: PusherReinitializeHandlerParams) => Promise<void>;
+
+let registeredHandler: PusherReinitializeHandler | null = null;
+
+function registerPusherReinitializeHandler(handler: PusherReinitializeHandler | null) {
+    registeredHandler = handler;
+}
+
+function requestPusherReinitialize(params?: PusherReinitializeHandlerParams): Promise<void> {
+    if (!registeredHandler) {
+        Log.warn('[requestPusherReinitialize] No handler registered, skipping Pusher reinitialization', {params});
+        return Promise.resolve();
+    }
+
+    return registeredHandler(params);
+}
+
+export {registerPusherReinitializeHandler, requestPusherReinitialize};
+export type {PusherReinitializeHandlerParams};