bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 07:43:35 +00:00
Code Issues Releases Wiki Activity

Remove showPasswordless conditionals (#11928)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/browser/config/base.json
View File

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

1
apps/browser/config/development.json
View File

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

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

@@ -64,7 +64,7 @@
>
<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>

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

@@ -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() {

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

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

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

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

4
apps/desktop/src/auth/login/desktop-login-component.service.ts
View File

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

1
apps/web/config/base.json
View File

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

4
apps/web/config/cloud.json
View File

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

4
apps/web/config/development.json
View File

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

4
apps/web/config/euprd.json
View File

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

4
apps/web/config/euqa.json
View File

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

4
apps/web/config/qa.json
View File

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

4
apps/web/config/selfhosted.json
View File

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

4
apps/web/config/usdev.json
View File

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

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

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

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

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

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

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

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

@@ -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) => {

4
apps/web/src/utils/flags.ts
View File

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