1
0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00

Remove showPasswordless conditionals (#11928)

Co-authored-by: Matt Bishop <mbishop@bitwarden.com>
This commit is contained in:
Todd Martin
2024-11-15 12:34:02 -05:00
committed by GitHub
parent d55c8712ac
commit 0308e6e180
26 changed files with 18 additions and 113 deletions

View File

@@ -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;

View File

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

View File

@@ -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
*/

View File

@@ -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

View File

@@ -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