diff --git a/apps/browser/config/base.json b/apps/browser/config/base.json
index 91d4830924..02bdc5d22a 100644
--- a/apps/browser/config/base.json
+++ b/apps/browser/config/base.json
@@ -1,7 +1,6 @@
{
"devFlags": {},
"flags": {
- "showPasswordless": true,
"accountSwitching": false,
"sdk": true
}
diff --git a/apps/browser/config/development.json b/apps/browser/config/development.json
index cc28e15f38..042a98c2c3 100644
--- a/apps/browser/config/development.json
+++ b/apps/browser/config/development.json
@@ -6,7 +6,6 @@
"skipWelcomeOnInstall": true
},
"flags": {
- "showPasswordless": true,
"accountSwitching": true
}
}
diff --git a/apps/browser/src/auth/popup/login-v1.component.html b/apps/browser/src/auth/popup/login-v1.component.html
index 9d2b4fccad..145a9cbc75 100644
--- a/apps/browser/src/auth/popup/login-v1.component.html
+++ b/apps/browser/src/auth/popup/login-v1.component.html
@@ -64,7 +64,7 @@
>
-
+
diff --git a/apps/browser/src/auth/popup/login-v1.component.ts b/apps/browser/src/auth/popup/login-v1.component.ts
index eee1bcc4d3..a64f4ef384 100644
--- a/apps/browser/src/auth/popup/login-v1.component.ts
+++ b/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
{
await super.ngOnInit();
- if (this.showPasswordless) {
- await this.validateEmail();
- }
+ await this.validateEmail();
}
settings() {
diff --git a/apps/browser/src/auth/popup/login/extension-login-component.service.spec.ts b/apps/browser/src/auth/popup/login/extension-login-component.service.spec.ts
index a7e2917101..4d3a776301 100644
--- a/apps/browser/src/auth/popup/login/extension-login-component.service.spec.ts
+++ b/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);
diff --git a/apps/browser/src/auth/popup/login/extension-login-component.service.ts b/apps/browser/src/auth/popup/login/extension-login-component.service.ts
index 8630030e8e..3b643fe9c8 100644
--- a/apps/browser/src/auth/popup/login/extension-login-component.service.ts
+++ b/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 });
}
diff --git a/apps/desktop/src/auth/login/desktop-login-component.service.ts b/apps/desktop/src/auth/login/desktop-login-component.service.ts
index c9b01c5624..ef0faaee1c 100644
--- a/apps/desktop/src/auth/login/desktop-login-component.service.ts
+++ b/apps/desktop/src/auth/login/desktop-login-component.service.ts
@@ -71,8 +71,4 @@ export class DesktopLoginComponentService
});
}
}
-
- isLoginViaAuthRequestSupported(): boolean {
- return true;
- }
}
diff --git a/apps/web/config/base.json b/apps/web/config/base.json
index cfaf604fb0..e64ef6ebeb 100644
--- a/apps/web/config/base.json
+++ b/apps/web/config/base.json
@@ -11,7 +11,6 @@
"allowedHosts": "auto"
},
"flags": {
- "showPasswordless": false,
"sdk": true
},
"devFlags": {}
diff --git a/apps/web/config/cloud.json b/apps/web/config/cloud.json
index 8817142c9e..600b346893 100644
--- a/apps/web/config/cloud.json
+++ b/apps/web/config/cloud.json
@@ -16,7 +16,5 @@
"proxyEvents": "https://events.bitwarden.com",
"proxyNotifications": "https://notifications.bitwarden.com"
},
- "flags": {
- "showPasswordless": true
- }
+ "flags": {}
}
diff --git a/apps/web/config/development.json b/apps/web/config/development.json
index 58dec82a15..f0a15f4f4d 100644
--- a/apps/web/config/development.json
+++ b/apps/web/config/development.json
@@ -19,8 +19,6 @@
}
}
],
- "flags": {
- "showPasswordless": true
- },
+ "flags": {},
"devFlags": {}
}
diff --git a/apps/web/config/euprd.json b/apps/web/config/euprd.json
index 99d98ca09d..016d7133e5 100644
--- a/apps/web/config/euprd.json
+++ b/apps/web/config/euprd.json
@@ -10,7 +10,5 @@
"businessId": "4ZDA7DLUUJGMN",
"buttonAction": "https://www.paypal.com/cgi-bin/webscr"
},
- "flags": {
- "showPasswordless": true
- }
+ "flags": {}
}
diff --git a/apps/web/config/euqa.json b/apps/web/config/euqa.json
index 5f74eb8829..9743654b94 100644
--- a/apps/web/config/euqa.json
+++ b/apps/web/config/euqa.json
@@ -20,7 +20,5 @@
}
}
],
- "flags": {
- "showPasswordless": true
- }
+ "flags": {}
}
diff --git a/apps/web/config/qa.json b/apps/web/config/qa.json
index 07e341e6f9..877506a20d 100644
--- a/apps/web/config/qa.json
+++ b/apps/web/config/qa.json
@@ -26,7 +26,5 @@
}
}
],
- "flags": {
- "showPasswordless": true
- }
+ "flags": {}
}
diff --git a/apps/web/config/selfhosted.json b/apps/web/config/selfhosted.json
index 9d8e1cf268..cd36ab15c5 100644
--- a/apps/web/config/selfhosted.json
+++ b/apps/web/config/selfhosted.json
@@ -6,7 +6,5 @@
"proxyNotifications": "http://localhost:61841",
"port": 8081
},
- "flags": {
- "showPasswordless": true
- }
+ "flags": {}
}
diff --git a/apps/web/config/usdev.json b/apps/web/config/usdev.json
index c19deba27b..88adaa726c 100644
--- a/apps/web/config/usdev.json
+++ b/apps/web/config/usdev.json
@@ -13,7 +13,5 @@
}
}
],
- "flags": {
- "showPasswordless": true
- }
+ "flags": {}
}
diff --git a/apps/web/src/app/auth/core/services/login/web-login-component.service.spec.ts b/apps/web/src/app/auth/core/services/login/web-login-component.service.spec.ts
index 2802b87c3e..db5f72ac31 100644
--- a/apps/web/src/app/auth/core/services/login/web-login-component.service.spec.ts
+++ b/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);
diff --git a/apps/web/src/app/auth/core/services/login/web-login-component.service.ts b/apps/web/src/app/auth/core/services/login/web-login-component.service.ts
index 30950ae13b..3e13d86aff 100644
--- a/apps/web/src/app/auth/core/services/login/web-login-component.service.ts
+++ b/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 {
const orgInvite = await this.acceptOrganizationInviteService.getOrganizationInvite();
diff --git a/apps/web/src/app/auth/login/login-v1.component.html b/apps/web/src/app/auth/login/login-v1.component.html
index 4f8ea93bbd..5b3c2a9942 100644
--- a/apps/web/src/app/auth/login/login-v1.component.html
+++ b/apps/web/src/app/auth/login/login-v1.component.html
@@ -92,7 +92,7 @@
-
+
-
+
{{ "or" | i18n }}