From 982da467b4a78a73ee754f871beb43ed6aacc341 Mon Sep 17 00:00:00 2001
From: Alec Rippberger <alec@livefront.com>
Date: Wed, 9 Oct 2024 18:54:53 -0500
Subject: [PATCH] Directly set clientType in individual login component
 services.

---
 .../src/auth/popup/login/extension-login-component.service.ts | 2 ++
 .../desktop/src/auth/login/desktop-login-component.service.ts | 2 ++
 .../auth/core/services/login/web-login-component.service.ts   | 2 ++
 .../auth/src/angular/login/default-login-component.service.ts | 4 +---
 4 files changed, 7 insertions(+), 3 deletions(-)

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 02385e40e53..d3dc9ec771e 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
@@ -1,4 +1,5 @@
 import { DefaultLoginComponentService, LoginComponentService } from "@bitwarden/auth/angular";
+import { ClientType } from "@bitwarden/common/enums";
 
 import { flagEnabled } from "../../../platform/flags";
 
@@ -6,6 +7,7 @@ export class ExtensionLoginComponentService
   extends DefaultLoginComponentService
   implements LoginComponentService
 {
+  clientType = ClientType.Browser;
   isLoginViaAuthRequestSupported(): boolean {
     return flagEnabled("showPasswordless");
   }
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 cd54163782b..3f3296b24f8 100644
--- a/apps/desktop/src/auth/login/desktop-login-component.service.ts
+++ b/apps/desktop/src/auth/login/desktop-login-component.service.ts
@@ -1,6 +1,7 @@
 import { inject } from "@angular/core";
 
 import { DefaultLoginComponentService, LoginComponentService } from "@bitwarden/auth/angular";
+import { ClientType } from "@bitwarden/common/enums";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { ToastService } from "@bitwarden/components";
@@ -11,6 +12,7 @@ export class DesktopLoginComponentService
 {
   i18nService = inject(I18nService);
   toastService = inject(ToastService);
+  clientType = ClientType.Desktop;
 
   override async launchSsoBrowserWindow(email: string, clientId: "desktop"): Promise<void | null> {
     if (!ipc.platform.isAppImage && !ipc.platform.isSnapStore && !ipc.platform.isDev) {
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 87d3aaac5dc..8ad2a297bd4 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
@@ -10,6 +10,7 @@ import {
 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 { 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 { flagEnabled } from "../../../../../utils/flags";
@@ -26,6 +27,7 @@ export class WebLoginComponentService
   policyService = inject(InternalPolicyService);
   router = inject(Router);
   routerService = inject(RouterService);
+  clientType = ClientType.Web;
 
   isLoginViaAuthRequestSupported(): boolean {
     return flagEnabled("showPasswordless");
diff --git a/libs/auth/src/angular/login/default-login-component.service.ts b/libs/auth/src/angular/login/default-login-component.service.ts
index 3e2edb22be9..f552f80dee3 100644
--- a/libs/auth/src/angular/login/default-login-component.service.ts
+++ b/libs/auth/src/angular/login/default-login-component.service.ts
@@ -20,9 +20,7 @@ export class DefaultLoginComponentService implements LoginComponentService {
     protected passwordGenerationService: PasswordGenerationServiceAbstraction,
     protected platformUtilsService: PlatformUtilsService,
     protected ssoLoginService: SsoLoginServiceAbstraction,
-  ) {
-    this.clientType = this.platformUtilsService.getClientType();
-  }
+  ) {}
 
   async getOrgPolicies(): Promise<PasswordPolicies | null> {
     return null;