bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 16:23:44 +00:00
Code Issues Releases Wiki Activity

Directly set clientType in individual login component services.

Browse Source
This commit is contained in:
Alec Rippberger
2024-10-09 18:54:53 -05:00
parent 6d980bfadd
commit 982da467b4
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
import { DefaultLoginComponentService, LoginComponentService } from "@bitwarden/auth/angular"; import { DefaultLoginComponentService, LoginComponentService } from "@bitwarden/auth/angular";
import { ClientType } from "@bitwarden/common/enums";
import { flagEnabled } from "../../../platform/flags"; import { flagEnabled } from "../../../platform/flags";
@@ -6,6 +7,7 @@ export class ExtensionLoginComponentService
extends DefaultLoginComponentService extends DefaultLoginComponentService
implements LoginComponentService implements LoginComponentService
{ {
clientType = ClientType.Browser;
isLoginViaAuthRequestSupported(): boolean { isLoginViaAuthRequestSupported(): boolean {
return flagEnabled("showPasswordless"); return flagEnabled("showPasswordless");
} }

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

@@ -1,6 +1,7 @@
import { inject } from "@angular/core"; import { inject } from "@angular/core";
import { DefaultLoginComponentService, LoginComponentService } from "@bitwarden/auth/angular"; import { DefaultLoginComponentService, LoginComponentService } from "@bitwarden/auth/angular";
import { ClientType } from "@bitwarden/common/enums";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { Utils } from "@bitwarden/common/platform/misc/utils"; import { Utils } from "@bitwarden/common/platform/misc/utils";
import { ToastService } from "@bitwarden/components"; import { ToastService } from "@bitwarden/components";
@@ -11,6 +12,7 @@ export class DesktopLoginComponentService
{ {
i18nService = inject(I18nService); i18nService = inject(I18nService);
toastService = inject(ToastService); toastService = inject(ToastService);
clientType = ClientType.Desktop;
override async launchSsoBrowserWindow(email: string, clientId: "desktop"): Promise<void | null> { override async launchSsoBrowserWindow(email: string, clientId: "desktop"): Promise<void | null> {
if (!ipc.platform.isAppImage && !ipc.platform.isSnapStore && !ipc.platform.isDev) { if (!ipc.platform.isAppImage && !ipc.platform.isSnapStore && !ipc.platform.isDev) {

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

@@ -10,6 +10,7 @@ import {
import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction"; import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction"; import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
import { Policy } from "@bitwarden/common/admin-console/models/domain/policy"; import { Policy } from "@bitwarden/common/admin-console/models/domain/policy";
import { ClientType } from "@bitwarden/common/enums";
import { LogService } from "@bitwarden/common/platform/abstractions/log.service"; import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
import { flagEnabled } from "../../../../../utils/flags"; import { flagEnabled } from "../../../../../utils/flags";
@@ -26,6 +27,7 @@ export class WebLoginComponentService
policyService = inject(InternalPolicyService); policyService = inject(InternalPolicyService);
router = inject(Router); router = inject(Router);
routerService = inject(RouterService); routerService = inject(RouterService);
clientType = ClientType.Web;
isLoginViaAuthRequestSupported(): boolean { isLoginViaAuthRequestSupported(): boolean {
return flagEnabled("showPasswordless"); return flagEnabled("showPasswordless");

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

@@ -20,9 +20,7 @@ export class DefaultLoginComponentService implements LoginComponentService {
protected passwordGenerationService: PasswordGenerationServiceAbstraction, protected passwordGenerationService: PasswordGenerationServiceAbstraction,
protected platformUtilsService: PlatformUtilsService, protected platformUtilsService: PlatformUtilsService,
protected ssoLoginService: SsoLoginServiceAbstraction, protected ssoLoginService: SsoLoginServiceAbstraction,
) { ) {}
this.clientType = this.platformUtilsService.getClientType();
}
async getOrgPolicies(): Promise<PasswordPolicies | null> { async getOrgPolicies(): Promise<PasswordPolicies | null> {
return null; return null;