refactored router service to not store on the disk

apps/browser/src/auth/guards/fido2-auth.guard.ts

@@ -22,12 +22,12 @@ export const fido2AuthGuard: CanActivateFn = async (
   const authStatus = await authService.getAuthStatus();
 
   if (authStatus === AuthenticationStatus.LoggedOut) {
-    await routerService.setPreviousUrl(state.url);
+    routerService.setPreviousUrl(state.url);
     return router.createUrlTree(["/home"], { queryParams: route.queryParams });
   }
 
   if (authStatus === AuthenticationStatus.Locked) {
-    await routerService.setPreviousUrl(state.url);
+    routerService.setPreviousUrl(state.url);
     return router.createUrlTree(["/lock"], { queryParams: route.queryParams });
   }
 

apps/browser/src/auth/popup/lock.component.ts

@@ -80,7 +80,7 @@ export class LockComponent extends BaseLockComponent {
     this.isInitialLockScreen = (window as any).previousPopupUrl == null;
 
     super.onSuccessfulSubmit = async () => {
-      const previousUrl = await this.routerService.getPreviousUrl();
+      const previousUrl = this.routerService.getPreviousUrl();
       if (previousUrl) {
         this.router.navigateByUrl(previousUrl);
       } else {

apps/browser/src/auth/popup/login.component.ts

@@ -73,7 +73,7 @@ export class LoginComponent extends BaseLoginComponent {
     super.successRoute = "/tabs/vault";
 
     super.onSuccessfulLoginNavigate = async () => {
-      const previousUrl = await this.routerService.getPreviousUrl();
+      const previousUrl = this.routerService.getPreviousUrl();
 
       if (previousUrl) {
         this.router.navigateByUrl(previousUrl);

apps/browser/src/auth/popup/two-factor.component.ts

@@ -87,7 +87,7 @@ export class TwoFactorComponent extends BaseTwoFactorComponent {
     super.successRoute = "/tabs/vault";
 
     super.onSuccessfulLoginNavigate = async () => {
-      const previousUrl = await this.routerService.getPreviousUrl();
+      const previousUrl = this.routerService.getPreviousUrl();
 
       if (previousUrl) {
         this.router.navigateByUrl(previousUrl);

apps/browser/src/platform/popup/services/browser-router.service.ts

@@ -8,7 +8,9 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.serv
   providedIn: "root",
 })
 export class BrowserRouterService {
-  constructor(router: Router, private stateService: StateService) {
+  private previousUrl: string = undefined;
+
+  constructor(private router: Router, private stateService: StateService) {
     router.events
       .pipe(filter((e) => e instanceof NavigationEnd))
       .subscribe((event: NavigationEnd) => {
@@ -27,16 +29,11 @@ export class BrowserRouterService {
       });
   }
 
-  async getPreviousUrl() {
+  getPreviousUrl() {
-    return this.stateService.getPreviousUrl();
+    return this.previousUrl;
   }
 
-  // Check validity of previous url
+  setPreviousUrl(url: string) {
-  async hasPreviousUrl() {
+    this.previousUrl = url;
-    return (await this.getPreviousUrl()) != "/";
-  }
-
-  async setPreviousUrl(url: string) {
-    await this.stateService.setPreviousUrl(url);
   }
 }

libs/common/src/platform/abstractions/state.service.ts

@@ -524,17 +524,4 @@ export abstract class StateService<T extends Account = Account> {
     value: Record<string, Record<string, boolean>>,
     options?: StorageOptions
   ) => Promise<void>;
-  /**
-   * fetches string value of the URL stored here, usually only called after SSO flows.
-   * @param options Defines the storage options for the URL; Defaults to Local Storage.
-   * @returns route called prior to SSO routing to organizations configured IdP.
-   */
-  getPreviousUrl: (options?: StorageOptions) => Promise<string>;
-  /**
-   * Store URL in local storage by default, but can be configured. Developed to handle
-   * SSO routing to organizations configured IdP.
-   * @param url URL of route
-   * @param options Defines the storage options for the URL; Defaults to Local Storage.
-   */
-  setPreviousUrl: (url: string, options?: StorageOptions) => Promise<void>;
 }

libs/common/src/platform/models/domain/global-state.ts

@@ -37,5 +37,4 @@ export class GlobalState {
   enableBrowserIntegrationFingerprint?: boolean;
   enableDuckDuckGoBrowserIntegration?: boolean;
   region?: string;
-  previousUrl?: string;
 }

libs/common/src/platform/services/state.service.ts

@@ -2828,23 +2828,6 @@ export class StateService<
     );
   }
 
-  async getPreviousUrl(options?: StorageOptions): Promise<string> {
-    return (
-      await this.getGlobals(this.reconcileOptions(options, await this.defaultOnDiskLocalOptions()))
-    )?.previousUrl;
-  }
-
-  async setPreviousUrl(url: string, options?: StorageOptions): Promise<void> {
-    const globals = await this.getGlobals(
-      this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())
-    );
-    globals.previousUrl = url;
-    await this.saveGlobals(
-      globals,
-      this.reconcileOptions(options, await this.defaultOnDiskLocalOptions())
-    );
-  }
-
   protected async getGlobals(options: StorageOptions): Promise<TGlobalState> {
     let globals: TGlobalState;
     if (this.useMemory(options.storageLocation)) {

libs/common/src/vault/services/fido2/fido2-authenticator.service.ts

@@ -83,8 +83,7 @@ export class Fido2AuthenticatorService implements Fido2AuthenticatorServiceAbstr
         throw new Fido2AutenticatorError(Fido2AutenticatorErrorCode.Unknown);
       }
 
-      //TODO: uncomment this when working on the login flow ticket
+      await userInterfaceSession.ensureUnlockedVault();
-      // await userInterfaceSession.ensureUnlockedVault();
 
       const existingCipherIds = await this.findExcludedCredentials(
         params.excludeCredentialDescriptorList
@@ -238,8 +237,7 @@ export class Fido2AuthenticatorService implements Fido2AuthenticatorServiceAbstr
 
       let cipherOptions: CipherView[];
 
-      //TODO: uncomment this when working on the login flow ticket
+      await userInterfaceSession.ensureUnlockedVault();
-      // await userInterfaceSession.ensureUnlockedVault();
 
       // eslint-disable-next-line no-empty
       if (params.allowCredentialDescriptorList?.length > 0) {