Remove showPasswordless conditionals (#11928)

Co-authored-by: Matt Bishop <[email protected]>

apps/browser/config/base.json

@@ -1,7 +1,6 @@
 {
   "devFlags": {},
   "flags": {
-    "showPasswordless": true,
     "accountSwitching": false,
     "sdk": true
   }

apps/browser/config/development.json

@@ -6,7 +6,6 @@
     "skipWelcomeOnInstall": true
   },
   "flags": {
-    "showPasswordless": true,
     "accountSwitching": true
   }
 }

apps/browser/src/auth/popup/login-v1.component.html

@@ -64,7 +64,7 @@ <h1 class="login-center">
         >
         <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
       </button>
-      <div class="tw-mb-3" *ngIf="showLoginWithDevice && showPasswordless">
+      <div class="tw-mb-3" *ngIf="showLoginWithDevice">
         <button type="button" class="btn block" (click)="startAuthRequestLogin()">
           <span> <i class="bwi bwi-mobile"></i> {{ "loginWithDevice" | i18n }} </span>
         </button>

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

@@ -25,14 +25,11 @@ import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.serv
 import { ToastService } from "@bitwarden/components";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 
-import { flagEnabled } from "../../platform/flags";
-
 @Component({
   selector: "app-login",
   templateUrl: "login-v1.component.html",
 })
 export class LoginComponentV1 extends BaseLoginComponent implements OnInit {
-  showPasswordless = false;
   constructor(
     devicesApiService: DevicesApiServiceAbstraction,
     appIdService: AppIdService,
@@ -82,14 +79,11 @@ export class LoginComponentV1 extends BaseLoginComponent implements OnInit {
       await syncService.fullSync(true);
     };
     this.successRoute = "/tabs/vault";
-    this.showPasswordless = flagEnabled("showPasswordless");
   }
 
   async ngOnInit(): Promise<void> {
     await super.ngOnInit();
-    if (this.showPasswordless) {
-      await this.validateEmail();
-    }
+    await this.validateEmail();
   }
 
   settings() {

apps/browser/src/auth/popup/login/extension-login-component.service.spec.ts

@@ -8,7 +8,6 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 
-import { flagEnabled } from "../../../platform/flags";
 import { BrowserPlatformUtilsService } from "../../../platform/services/platform-utils/browser-platform-utils.service";
 import { ExtensionAnonLayoutWrapperDataService } from "../extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service";
 
@@ -62,18 +61,6 @@ describe("ExtensionLoginComponentService", () => {
     expect(service).toBeTruthy();
   });
 
-  describe("isLoginViaAuthRequestSupported", () => {
-    it("returns true if showPasswordless flag is enabled", () => {
-      (flagEnabled as jest.Mock).mockReturnValue(true);
-      expect(service.isLoginViaAuthRequestSupported()).toBe(true);
-    });
-
-    it("returns false if showPasswordless flag is disabled", () => {
-      (flagEnabled as jest.Mock).mockReturnValue(false);
-      expect(service.isLoginViaAuthRequestSupported()).toBeFalsy();
-    });
-  });
-
   describe("showBackButton", () => {
     it("sets showBackButton in extensionAnonLayoutWrapperDataService", () => {
       service.showBackButton(true);

apps/browser/src/auth/popup/login/extension-login-component.service.ts

@@ -7,7 +7,6 @@ import { EnvironmentService } from "@bitwarden/common/platform/abstractions/envi
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 
-import { flagEnabled } from "../../../platform/flags";
 import { ExtensionAnonLayoutWrapperDataService } from "../extension-anon-layout-wrapper/extension-anon-layout-wrapper-data.service";
 
 @Injectable()
@@ -33,10 +32,6 @@ export class ExtensionLoginComponentService
     this.clientType = this.platformUtilsService.getClientType();
   }
 
-  isLoginViaAuthRequestSupported(): boolean {
-    return flagEnabled("showPasswordless");
-  }
-
   showBackButton(showBackButton: boolean): void {
     this.extensionAnonLayoutWrapperDataService.setAnonLayoutWrapperData({ showBackButton });
   }

apps/desktop/src/auth/login/desktop-login-component.service.ts

@@ -71,8 +71,4 @@ export class DesktopLoginComponentService
       });
     }
   }
-
-  isLoginViaAuthRequestSupported(): boolean {
-    return true;
-  }
 }

apps/web/config/base.json

@@ -11,7 +11,6 @@
     "allowedHosts": "auto"
   },
   "flags": {
-    "showPasswordless": false,
     "sdk": true
   },
   "devFlags": {}

apps/web/config/cloud.json

@@ -16,7 +16,5 @@
     "proxyEvents": "https://events.bitwarden.com",
     "proxyNotifications": "https://notifications.bitwarden.com"
   },
-  "flags": {
-    "showPasswordless": true
-  }
+  "flags": {}
 }

apps/web/config/development.json

@@ -19,8 +19,6 @@
       }
     }
   ],
-  "flags": {
-    "showPasswordless": true
-  },
+  "flags": {},
   "devFlags": {}
 }

apps/web/config/euprd.json

@@ -10,7 +10,5 @@
     "businessId": "4ZDA7DLUUJGMN",
     "buttonAction": "https://www.paypal.com/cgi-bin/webscr"
   },
-  "flags": {
-    "showPasswordless": true
-  }
+  "flags": {}
 }

apps/web/config/euqa.json

@@ -20,7 +20,5 @@
       }
     }
   ],
-  "flags": {
-    "showPasswordless": true
-  }
+  "flags": {}
 }

apps/web/config/qa.json

@@ -26,7 +26,5 @@
       }
     }
   ],
-  "flags": {
-    "showPasswordless": true
-  }
+  "flags": {}
 }

apps/web/config/selfhosted.json

@@ -6,7 +6,5 @@
     "proxyNotifications": "http://localhost:61841",
     "port": 8081
   },
-  "flags": {
-    "showPasswordless": true
-  }
+  "flags": {}
 }

apps/web/config/usdev.json

@@ -13,7 +13,5 @@
       }
     }
   ],
-  "flags": {
-    "showPasswordless": true
-  }
+  "flags": {}
 }

apps/web/src/app/auth/core/services/login/web-login-component.service.spec.ts

@@ -16,7 +16,6 @@ import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/pl
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 
 import { RouterService } from "../../../../../../../../apps/web/src/app/core";
-import { flagEnabled } from "../../../../../utils/flags";
 import { AcceptOrganizationInviteService } from "../../../organization-invite/accept-organization.service";
 
 import { WebLoginComponentService } from "./web-login-component.service";
@@ -73,18 +72,6 @@ describe("WebLoginComponentService", () => {
     expect(service).toBeTruthy();
   });
 
-  describe("isLoginViaAuthRequestSupported", () => {
-    it("returns true if showPasswordless flag is enabled", () => {
-      (flagEnabled as jest.Mock).mockReturnValue(true);
-      expect(service.isLoginViaAuthRequestSupported()).toBe(true);
-    });
-
-    it("returns false if showPasswordless flag is disabled", () => {
-      (flagEnabled as jest.Mock).mockReturnValue(false);
-      expect(service.isLoginViaAuthRequestSupported()).toBeFalsy();
-    });
-  });
-
   describe("getOrgPolicies", () => {
     it("returns undefined if organization invite is null", async () => {
       acceptOrganizationInviteService.getOrganizationInvite.mockResolvedValue(null);

apps/web/src/app/auth/core/services/login/web-login-component.service.ts

@@ -16,7 +16,6 @@ import { LogService } from "@bitwarden/common/platform/abstractions/log.service"
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 
-import { flagEnabled } from "../../../../../utils/flags";
 import { RouterService } from "../../../../core/router.service";
 import { AcceptOrganizationInviteService } from "../../../organization-invite/accept-organization.service";
 
@@ -47,10 +46,6 @@ export class WebLoginComponentService
     this.clientType = this.platformUtilsService.getClientType();
   }
 
-  isLoginViaAuthRequestSupported(): boolean {
-    return flagEnabled("showPasswordless");
-  }
-
   async getOrgPolicies(): Promise<PasswordPolicies | null> {
     const orgInvite = await this.acceptOrganizationInviteService.getOrganizationInvite();
 

apps/web/src/app/auth/login/login-v1.component.html

@@ -92,7 +92,7 @@
       </button>
     </div>
 
-    <div class="tw-mb-3" *ngIf="showLoginWithDevice && showPasswordless">
+    <div class="tw-mb-3" *ngIf="showLoginWithDevice">
       <button
         bitButton
         type="button"

apps/web/src/app/auth/login/login-v1.component.ts

@@ -32,7 +32,6 @@ import { UserId } from "@bitwarden/common/types/guid";
 import { ToastService } from "@bitwarden/components";
 import { PasswordGenerationServiceAbstraction } from "@bitwarden/generator-legacy";
 
-import { flagEnabled } from "../../../utils/flags";
 import { RouterService } from "../../core";
 import { AcceptOrganizationInviteService } from "../organization-invite/accept-organization.service";
 import { OrganizationInvite } from "../organization-invite/organization-invite";
@@ -46,7 +45,6 @@ export class LoginComponentV1 extends BaseLoginComponent implements OnInit {
   showResetPasswordAutoEnrollWarning = false;
   enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions;
   policies: Policy[];
-  showPasswordless = false;
 
   constructor(
     private acceptOrganizationInviteService: AcceptOrganizationInviteService,
@@ -98,7 +96,6 @@ export class LoginComponentV1 extends BaseLoginComponent implements OnInit {
       toastService,
     );
     this.onSuccessfulLoginNavigate = this.goAfterLogIn;
-    this.showPasswordless = flagEnabled("showPasswordless");
   }
 
   submitForm = async (showToast = true) => {

apps/web/src/utils/flags.ts

@@ -8,9 +8,7 @@ import {
 
 // required to avoid linting errors when there are no flags
 // eslint-disable-next-line @typescript-eslint/ban-types
-export type Flags = {
-  showPasswordless?: boolean;
-} & SharedFlags;
+export type Flags = {} & SharedFlags;
 
 // required to avoid linting errors when there are no flags
 // eslint-disable-next-line @typescript-eslint/ban-types

libs/auth/src/angular/login/default-login-component.service.spec.ts

@@ -63,12 +63,6 @@ describe("DefaultLoginComponentService", () => {
     });
   });
 
-  describe("isLoginViaAuthRequestSupported", () => {
-    it("returns false by default", () => {
-      expect(service.isLoginViaAuthRequestSupported()).toBe(false);
-    });
-  });
-
   describe("isLoginWithPasskeySupported", () => {
     it("returns true when clientType is Web", () => {
       service["clientType"] = ClientType.Web;

libs/auth/src/angular/login/default-login-component.service.ts

@@ -25,10 +25,6 @@ export class DefaultLoginComponentService implements LoginComponentService {
     return null;
   }
 
-  isLoginViaAuthRequestSupported(): boolean {
-    return false;
-  }
-
   isLoginWithPasskeySupported(): boolean {
     return this.clientType === ClientType.Web;
   }

libs/auth/src/angular/login/login-component.service.ts

@@ -23,11 +23,6 @@ export abstract class LoginComponentService {
    */
   getOrgPolicies: () => Promise<PasswordPolicies | null>;
 
-  /**
-   * Indicates whether login with device (auth request) is supported on the given client
-   */
-  isLoginViaAuthRequestSupported: () => boolean;
-
   /**
    * Indicates whether login with passkey is supported on the given client
    */

libs/auth/src/angular/login/login.component.html

@@ -112,7 +112,7 @@
       </button>
 
       <!-- Button to Login with Device -->
-      <ng-container *ngIf="loginViaAuthRequestSupported && isKnownDevice">
+      <ng-container *ngIf="isKnownDevice">
         <div class="tw-text-center">{{ "or" | i18n }}</div>
 
         <button

libs/auth/src/angular/login/login.component.ts

@@ -104,12 +104,6 @@ export class LoginComponent implements OnInit, OnDestroy {
     return this.formGroup.controls.email;
   }
 
-  /**
-   * LoginViaAuthRequestSupported is a boolean that determines if we show the Login with device button.
-   * An AuthRequest is the mechanism that allows users to login to the client via a device that is already logged in.
-   */
-  loginViaAuthRequestSupported = false;
-
   // Web properties
   enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions;
   policies: Policy[];
@@ -144,7 +138,6 @@ export class LoginComponent implements OnInit, OnDestroy {
     private configService: ConfigService,
   ) {
     this.clientType = this.platformUtilsService.getClientType();
-    this.loginViaAuthRequestSupported = this.loginComponentService.isLoginViaAuthRequestSupported();
   }
 
   async ngOnInit(): Promise<void> {
@@ -402,10 +395,8 @@ export class LoginComponent implements OnInit, OnDestroy {
       // Reset master password only when going from validated to not validated so that autofill can work properly
       this.formGroup.controls.masterPassword.reset();
 
-      if (this.loginViaAuthRequestSupported) {
-        // Reset known device state when going back to email entry if it is supported
-        this.isKnownDevice = false;
-      }
+      // Reset known device state when going back to email entry if it is supported
+      this.isKnownDevice = false;
     } else if (this.loginUiState === LoginUiState.MASTER_PASSWORD_ENTRY) {
       this.loginComponentService.showBackButton(true);
       this.anonLayoutWrapperDataService.setAnonLayoutWrapperData({
@@ -426,9 +417,8 @@ export class LoginComponent implements OnInit, OnDestroy {
         });
       }
 
-      if (this.loginViaAuthRequestSupported) {
-        await this.getKnownDevice(this.emailFormControl.value);
-      }
+      // Check to see if the device is known so we can show the Login with Device option
+      await this.getKnownDevice(this.emailFormControl.value);
     }
   }
 
@@ -580,9 +570,8 @@ export class LoginComponent implements OnInit, OnDestroy {
       await this.loadEmailSettings();
     }
 
-    if (this.loginViaAuthRequestSupported) {
-      await this.getKnownDevice(this.emailFormControl.value);
-    }
+    // Check to see if the device is known so that we can show the Login with Device option
+    await this.getKnownDevice(this.emailFormControl.value);
 
     // Backup check to handle unknown case where activatedRoute is not available
     // This shouldn't happen under normal circumstances

libs/common/src/platform/misc/flags.ts

@@ -1,7 +1,6 @@
 // required to avoid linting errors when there are no flags
 // eslint-disable-next-line @typescript-eslint/ban-types
 export type SharedFlags = {
-  showPasswordless?: boolean;
   sdk?: boolean;
   prereleaseBuild?: boolean;
 };