From 924d0b7dfec07685e81ece69de18d4dd534a9521 Mon Sep 17 00:00:00 2001
From: Jared Snider <116684653+JaredSnider-Bitwarden@users.noreply.github.com>
Date: Tue, 20 Aug 2024 17:24:49 -0400
Subject: [PATCH] Move extension refresh swap function to libs so other clients
 can use it (#10640)

* Move extension refresh swap function to libs so other clients can use it

* Update extensionRefreshSwap docs
---
 apps/browser/src/popup/app-routing.module.ts  |  3 +-
 .../popup/extension-refresh-route-utils.ts    | 27 ++--------------
 .../src/utils/extension-refresh-swap.ts       | 32 +++++++++++++++++++
 3 files changed, 36 insertions(+), 26 deletions(-)
 create mode 100644 libs/angular/src/utils/extension-refresh-swap.ts

diff --git a/apps/browser/src/popup/app-routing.module.ts b/apps/browser/src/popup/app-routing.module.ts
index 688e7e72a0..79a2df30e6 100644
--- a/apps/browser/src/popup/app-routing.module.ts
+++ b/apps/browser/src/popup/app-routing.module.ts
@@ -9,6 +9,7 @@ import {
   unauthGuardFn,
 } from "@bitwarden/angular/auth/guards";
 import { canAccessFeature } from "@bitwarden/angular/platform/guard/feature-flag.guard";
+import { extensionRefreshSwap } from "@bitwarden/angular/utils/extension-refresh-swap";
 import {
   AnonLayoutWrapperComponent,
   AnonLayoutWrapperData,
@@ -91,7 +92,7 @@ import { SyncComponent } from "../vault/popup/settings/sync.component";
 import { VaultSettingsV2Component } from "../vault/popup/settings/vault-settings-v2.component";
 import { VaultSettingsComponent } from "../vault/popup/settings/vault-settings.component";
 
-import { extensionRefreshRedirect, extensionRefreshSwap } from "./extension-refresh-route-utils";
+import { extensionRefreshRedirect } from "./extension-refresh-route-utils";
 import { debounceNavigationGuard } from "./services/debounce-navigation.service";
 import { TabsV2Component } from "./tabs-v2.component";
 import { TabsComponent } from "./tabs.component";
diff --git a/apps/browser/src/popup/extension-refresh-route-utils.ts b/apps/browser/src/popup/extension-refresh-route-utils.ts
index 3c2ca33f86..9d45d7d656 100644
--- a/apps/browser/src/popup/extension-refresh-route-utils.ts
+++ b/apps/browser/src/popup/extension-refresh-route-utils.ts
@@ -1,32 +1,9 @@
-import { inject, Type } from "@angular/core";
-import { Route, Router, Routes, UrlTree } from "@angular/router";
+import { inject } from "@angular/core";
+import { Router, UrlTree } from "@angular/router";
 
-import { componentRouteSwap } from "@bitwarden/angular/utils/component-route-swap";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 
-/**
- * Helper function to swap between two components based on the ExtensionRefresh feature flag.
- * @param defaultComponent - The current non-refreshed component to render.
- * @param refreshedComponent - The new refreshed component to render.
- * @param options - The shared route options to apply to both components.
- */
-export function extensionRefreshSwap(
-  defaultComponent: Type<any>,
-  refreshedComponent: Type<any>,
-  options: Route,
-): Routes {
-  return componentRouteSwap(
-    defaultComponent,
-    refreshedComponent,
-    async () => {
-      const configService = inject(ConfigService);
-      return configService.getFeatureFlag(FeatureFlag.ExtensionRefresh);
-    },
-    options,
-  );
-}
-
 /**
  * Helper function to redirect to a new URL based on the ExtensionRefresh feature flag.
  * @param redirectUrl - The URL to redirect to if the ExtensionRefresh flag is enabled.
diff --git a/libs/angular/src/utils/extension-refresh-swap.ts b/libs/angular/src/utils/extension-refresh-swap.ts
new file mode 100644
index 0000000000..6512be032d
--- /dev/null
+++ b/libs/angular/src/utils/extension-refresh-swap.ts
@@ -0,0 +1,32 @@
+import { Type, inject } from "@angular/core";
+import { Route, Routes } from "@angular/router";
+
+import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
+import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
+
+import { componentRouteSwap } from "./component-route-swap";
+
+/**
+ * Helper function to swap between two components based on the ExtensionRefresh feature flag.
+ * @param defaultComponent - The current non-refreshed component to render.
+ * @param refreshedComponent - The new refreshed component to render.
+ * @param options - The shared route options to apply to the default component, and to the alt component if altOptions is not provided.
+ * @param altOptions - The alt route options to apply to the alt component.
+ */
+export function extensionRefreshSwap(
+  defaultComponent: Type<any>,
+  refreshedComponent: Type<any>,
+  options: Route,
+  altOptions?: Route,
+): Routes {
+  return componentRouteSwap(
+    defaultComponent,
+    refreshedComponent,
+    async () => {
+      const configService = inject(ConfigService);
+      return configService.getFeatureFlag(FeatureFlag.ExtensionRefresh);
+    },
+    options,
+    altOptions,
+  );
+}