[PM-17168] Sync organization user revoked/restored status immediately via push notification

apps/browser/src/background/main.background.ts

@@ -1045,6 +1045,7 @@ export default class MainBackground {
       this.authService,
       this.messagingService,
       this.taskSchedulerService,
+      this.configService,
     );
 
     this.fido2UserInterfaceService = new BrowserFido2UserInterfaceService(this.authService);

libs/angular/src/services/jslib-services.module.ts

@@ -892,6 +892,7 @@ const safeProviders: SafeProvider[] = [
       AuthServiceAbstraction,
       MessagingServiceAbstraction,
       TaskSchedulerService,
+      ConfigService,
     ],
   }),
   safeProvider({

libs/common/src/enums/feature-flag.enum.ts

@@ -9,6 +9,7 @@ export enum FeatureFlag {
   AccountDeprovisioning = "pm-10308-account-deprovisioning",
   VerifiedSsoDomainEndpoint = "pm-12337-refactor-sso-details-endpoint",
   PM14505AdminConsoleIntegrationPage = "pm-14505-admin-console-integration-page",
+  PushSyncOrgKeysOnRevokeRestore = "pm-17168-push-sync-org-keys-on-revoke-restore",
 
   /* Autofill */
   BlockBrowserInjectionsByDomain = "block-browser-injections-by-domain",
@@ -66,6 +67,7 @@ export const DefaultFeatureFlagValue = {
   [FeatureFlag.AccountDeprovisioning]: FALSE,
   [FeatureFlag.VerifiedSsoDomainEndpoint]: FALSE,
   [FeatureFlag.PM14505AdminConsoleIntegrationPage]: FALSE,
+  [FeatureFlag.PushSyncOrgKeysOnRevokeRestore]: FALSE,
 
   /* Autofill */
   [FeatureFlag.BlockBrowserInjectionsByDomain]: FALSE,

libs/common/src/services/notifications.service.ts

@@ -11,13 +11,15 @@
 import { AuthService } from "../auth/abstractions/auth.service";
 import { AuthenticationStatus } from "../auth/enums/authentication-status";
 import { NotificationType } from "../enums";
+import { FeatureFlag } from "../enums/feature-flag.enum";
 import {
   NotificationResponse,
   SyncCipherNotification,
   SyncFolderNotification,
   SyncSendNotification,
 } from "../models/response/notification.response";
 import { AppIdService } from "../platform/abstractions/app-id.service";
+import { ConfigService } from "../platform/abstractions/config/config.service";
 import { EnvironmentService } from "../platform/abstractions/environment.service";
 import { LogService } from "../platform/abstractions/log.service";
 import { MessagingService } from "../platform/abstractions/messaging.service";
@@ -46,6 +48,7 @@
     private authService: AuthService,
     private messagingService: MessagingService,
     private taskSchedulerService: TaskSchedulerService,
+    private configService: ConfigService,
   ) {
     this.taskSchedulerService.registerTaskHandler(
       ScheduledTaskNames.notificationsReconnectTimeout,
@@ -80,29 +83,7 @@
       this.signalrConnection = null;
     }
 
-    this.signalrConnection = new signalR.HubConnectionBuilder()
-      .withUrl(this.url + "/hub", {
-        accessTokenFactory: () => this.apiService.getActiveBearerToken(),
-        skipNegotiation: true,
-        transport: signalR.HttpTransportType.WebSockets,
-      })
-      .withHubProtocol(new signalRMsgPack.MessagePackHubProtocol() as signalR.IHubProtocol)
-      // .configureLogging(signalR.LogLevel.Trace)
-      .build();
-
-    this.signalrConnection.on("ReceiveMessage", (data: any) =>
-      this.processNotification(new NotificationResponse(data)),
-    );
-    // eslint-disable-next-line
-    this.signalrConnection.on("Heartbeat", (data: any) => {
-      /*console.log('Heartbeat!');*/
-    });
-    this.signalrConnection.onclose(() => {
-      this.connected = false;
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.reconnect(true);
-    });
+    this.signalrConnection = this.setupConnection();
     this.inited = true;
     if (await this.isAuthedAndUnlocked()) {
       await this.reconnect(false);
@@ -192,6 +173,9 @@
         break;
       case NotificationType.SyncOrgKeys:
         if (isAuthenticated) {
+          if (await this.configService.getFeatureFlag(FeatureFlag.PushSyncOrgKeysOnRevokeRestore)) {
+            await this.apiService.refreshIdentityToken();
+          }
           await this.syncService.fullSync(true);
           // Stop so a reconnect can be made
           await this.signalrConnection.stop();
@@ -249,6 +233,10 @@
     }
 
     try {
+      if (await this.configService.getFeatureFlag(FeatureFlag.PushSyncOrgKeysOnRevokeRestore)) {
+        this.signalrConnection = this.setupConnection();
+      }
+
       await this.signalrConnection.start();
       this.connected = true;
       if (sync) {
@@ -277,4 +265,28 @@
     max = Math.floor(max);
     return Math.floor(Math.random() * (max - min + 1)) + min;
   }
+
+  private setupConnection(): signalR.HubConnection {
+    const connection = new signalR.HubConnectionBuilder()
+      .withUrl(this.url + "/hub", {
+        accessTokenFactory: () => this.apiService.getActiveBearerToken(),
+        skipNegotiation: true,
+        transport: signalR.HttpTransportType.WebSockets,
+      })
+      .withHubProtocol(new signalRMsgPack.MessagePackHubProtocol() as signalR.IHubProtocol)
+      .build();
+
+    connection.on("ReceiveMessage", (data: any) =>
+      this.processNotification(new NotificationResponse(data)),
+    );
+    connection.on("Heartbeat", (data: any) => {
+      /*console.log('Heartbeat!');*/
+    });
+    connection.onclose(async () => {
+      this.connected = false;
+      await this.reconnect(true);
+    });
+
+    return connection;
+  }
 }