Merge branch 'main' into km/pm-18576/fix-missing-userid-on-remove-password

# Conflicts: # libs/angular/src/auth/components/remove-password.component.ts # libs/common/src/key-management/key-connector/abstractions/key-connector.service.ts # libs/common/src/key-management/key-connector/services/key-connector.service.ts
2026-02-08 20:50:28 +00:00 · 2025-03-13 16:27:58 +00:00
parent ea231e355b 54c779afe8
commit 53cd7e7a0d
55 changed files with 88 additions and 420 deletions
--- a/apps/browser/src/_locales/en/messages.json
+++ b/apps/browser/src/_locales/en/messages.json
@@ -263,12 +263,6 @@
  "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
    "message": "Enter your account email address and your password hint will be sent to you"
  },
-  "passwordHint": {
-    "message": "Password hint"
-  },
-  "enterEmailToGetHint": {
-    "message": "Enter your account email address to receive your master password hint."
-  },
  "getMasterPasswordHint": {
    "message": "Get master password hint"
  },
--- a/apps/browser/src/auth/popup/hint.component.html
+++ b/apps/browser/src/auth/popup/hint.component.html
@@ -1,41 +0,0 @@
-<form #form (ngSubmit)="submit()" [appApiAction]="formPromise">
-  <header>
-    <div class="left">
-      <button type="button" routerLink="/login">
-        {{ "cancel" | i18n }}
-      </button>
-    </div>
-    <h1 class="center">
-      <span class="title">{{ "passwordHint" | i18n }}</span>
-    </h1>
-    <div class="right">
-      <button type="submit" [disabled]="form.loading">
-        <span [hidden]="form.loading">{{ "submit" | i18n }}</span>
-        <i class="bwi bwi-spinner bwi-lg bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
-      </button>
-    </div>
-  </header>
-  <main tabindex="-1">
-    <div class="box">
-      <div class="box-content">
-        <div class="box-content-row" appBoxRow>
-          <label for="email">{{ "emailAddress" | i18n }}</label>
-          <input
-            id="email"
-            type="text"
-            name="Email"
-            aria-describedby="emailHelp"
-            [(ngModel)]="email"
-            required
-            appAutofocus
-            inputmode="email"
-            appInputVerbatim="false"
-          />
-        </div>
-      </div>
-      <div id="emailHelp" class="box-footer">
-        {{ "enterEmailToGetHint" | i18n }}
-      </div>
-    </div>
-  </main>
-</form>
--- a/apps/browser/src/auth/popup/hint.component.ts
+++ b/apps/browser/src/auth/popup/hint.component.ts
@@ -1,43 +0,0 @@
-import { Component } from "@angular/core";
-import { ActivatedRoute, Router } from "@angular/router";
-
-import { HintComponent as BaseHintComponent } from "@bitwarden/angular/auth/components/hint.component";
-import { LoginEmailServiceAbstraction } from "@bitwarden/auth/common";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { ToastService } from "@bitwarden/components";
-
-@Component({
-  selector: "app-hint",
-  templateUrl: "hint.component.html",
-})
-export class HintComponent extends BaseHintComponent {
-  constructor(
-    router: Router,
-    platformUtilsService: PlatformUtilsService,
-    i18nService: I18nService,
-    apiService: ApiService,
-    logService: LogService,
-    private route: ActivatedRoute,
-    loginEmailService: LoginEmailServiceAbstraction,
-    toastService: ToastService,
-  ) {
-    super(
-      router,
-      i18nService,
-      apiService,
-      platformUtilsService,
-      logService,
-      loginEmailService,
-      toastService,
-    );
-
-    this.onSuccessfulSubmit = async () => {
-      // FIXME: Verify that this floating promise is intentional. If it is, add an explanatory comment and ensure there is proper error handling.
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      this.router.navigate([this.successRoute]);
-    };
-  }
-}
--- a/apps/browser/src/background/main.background.ts
+++ b/apps/browser/src/background/main.background.ts
@@ -35,7 +35,6 @@ import { AvatarService as AvatarServiceAbstraction } from "@bitwarden/common/aut
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust.service.abstraction";
 import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
 import { DevicesApiServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices-api.service.abstraction";
-import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarden/common/auth/abstractions/key-connector.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
 import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/sso-login.service.abstraction";
 import { TokenService as TokenServiceAbstraction } from "@bitwarden/common/auth/abstractions/token.service";
@@ -49,7 +48,6 @@ import { AvatarService } from "@bitwarden/common/auth/services/avatar.service";
 import { DeviceTrustService } from "@bitwarden/common/auth/services/device-trust.service.implementation";
 import { DevicesServiceImplementation } from "@bitwarden/common/auth/services/devices/devices.service.implementation";
 import { DevicesApiServiceImplementation } from "@bitwarden/common/auth/services/devices-api.service.implementation";
-import { KeyConnectorService } from "@bitwarden/common/auth/services/key-connector.service";
 import { MasterPasswordService } from "@bitwarden/common/auth/services/master-password/master-password.service";
 import { SsoLoginService } from "@bitwarden/common/auth/services/sso-login.service";
 import { TokenService } from "@bitwarden/common/auth/services/token.service";
@@ -82,6 +80,8 @@ import { BulkEncryptServiceImplementation } from "@bitwarden/common/key-manageme
 import { EncryptServiceImplementation } from "@bitwarden/common/key-management/crypto/services/encrypt.service.implementation";
 import { FallbackBulkEncryptService } from "@bitwarden/common/key-management/crypto/services/fallback-bulk-encrypt.service";
 import { MultithreadEncryptServiceImplementation } from "@bitwarden/common/key-management/crypto/services/multithread-encrypt.service.implementation";
+import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
+import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/services/key-connector.service";
 import { DefaultProcessReloadService } from "@bitwarden/common/key-management/services/default-process-reload.service";
 import {
  DefaultVaultTimeoutSettingsService,
--- a/apps/browser/src/popup/app.module.ts
+++ b/apps/browser/src/popup/app.module.ts
@@ -21,7 +21,6 @@ import { AccountComponent } from "../auth/popup/account-switching/account.compon
 import { CurrentAccountComponent } from "../auth/popup/account-switching/current-account.component";
 import { EnvironmentComponent } from "../auth/popup/environment.component";
 import { ExtensionAnonLayoutWrapperComponent } from "../auth/popup/extension-anon-layout-wrapper/extension-anon-layout-wrapper.component";
-import { HintComponent } from "../auth/popup/hint.component";
 import { LoginDecryptionOptionsComponentV1 } from "../auth/popup/login-decryption-options/login-decryption-options-v1.component";
 import { RemovePasswordComponent } from "../auth/popup/remove-password.component";
 import { SetPasswordComponent } from "../auth/popup/set-password.component";
@@ -94,7 +93,6 @@ import "../platform/popup/locales";
    ColorPasswordPipe,
    ColorPasswordCountPipe,
    EnvironmentComponent,
-    HintComponent,
    LoginDecryptionOptionsComponentV1,
    SetPasswordComponent,
    SsoComponentV1,
--- a/apps/cli/src/auth/commands/login.command.ts
+++ b/apps/cli/src/auth/commands/login.command.ts
@@ -20,7 +20,6 @@ import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abs
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
 import { MasterPasswordApiService } from "@bitwarden/common/auth/abstractions/master-password-api.service.abstraction";
 import { TwoFactorService } from "@bitwarden/common/auth/abstractions/two-factor.service";
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
@@ -31,6 +30,7 @@ import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.
 import { TwoFactorEmailRequest } from "@bitwarden/common/auth/models/request/two-factor-email.request";
 import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request";
 import { ClientType } from "@bitwarden/common/enums";
+import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import { ErrorResponse } from "@bitwarden/common/models/response/error.response";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
--- a/apps/cli/src/auth/commands/unlock.command.ts
+++ b/apps/cli/src/auth/commands/unlock.command.ts
@@ -4,11 +4,11 @@ import { firstValueFrom, map } from "rxjs";

 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
-import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
 import { MasterPasswordVerification } from "@bitwarden/common/auth/types/verification";
+import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
--- a/apps/cli/src/commands/convert-to-key-connector.command.ts
+++ b/apps/cli/src/commands/convert-to-key-connector.command.ts
@@ -2,7 +2,7 @@ import * as inquirer from "inquirer";
 import { firstValueFrom } from "rxjs";

 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
-import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
+import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import {
  EnvironmentService,
  Region,
--- a/apps/cli/src/service-container/service-container.ts
+++ b/apps/cli/src/service-container/service-container.ts
@@ -46,7 +46,6 @@ import { AuthService } from "@bitwarden/common/auth/services/auth.service";
 import { AvatarService } from "@bitwarden/common/auth/services/avatar.service";
 import { DeviceTrustService } from "@bitwarden/common/auth/services/device-trust.service.implementation";
 import { DevicesApiServiceImplementation } from "@bitwarden/common/auth/services/devices-api.service.implementation";
-import { KeyConnectorService } from "@bitwarden/common/auth/services/key-connector.service";
 import { MasterPasswordApiService } from "@bitwarden/common/auth/services/master-password/master-password-api.service.implementation";
 import { MasterPasswordService } from "@bitwarden/common/auth/services/master-password/master-password.service";
 import { TokenService } from "@bitwarden/common/auth/services/token.service";
@@ -66,6 +65,7 @@ import { DefaultBillingAccountProfileStateService } from "@bitwarden/common/bill
 import { ClientType } from "@bitwarden/common/enums";
 import { EncryptServiceImplementation } from "@bitwarden/common/key-management/crypto/services/encrypt.service.implementation";
 import { FallbackBulkEncryptService } from "@bitwarden/common/key-management/crypto/services/fallback-bulk-encrypt.service";
+import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/services/key-connector.service";
 import {
  DefaultVaultTimeoutService,
  DefaultVaultTimeoutSettingsService,
--- a/apps/desktop/electron-builder.json
+++ b/apps/desktop/electron-builder.json
@@ -249,7 +249,8 @@
        "polkit": {
          "action-prefix": "com.bitwarden.Bitwarden"
        }
-      }
+      },
+      "u2f-devices"
    ],
    "stagePackages": ["default"]
  },
--- a/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
+++ b/apps/desktop/resources/com.bitwarden.desktop.devel.yaml
@@ -22,6 +22,7 @@ finish-args:
  - --talk-name=org.freedesktop.ScreenSaver
  - --system-talk-name=org.freedesktop.login1
  - --filesystem=xdg-download
+  - --device=all
 modules:
  - name: bitwarden-desktop
    buildsystem: simple
--- a/apps/desktop/src/app/app.component.ts
+++ b/apps/desktop/src/app/app.component.ts
@@ -26,7 +26,6 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction
 import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
 import { MasterPasswordServiceAbstraction } from "@bitwarden/common/auth/abstractions/master-password.service.abstraction";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
@@ -34,6 +33,7 @@ import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/for
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { FeatureFlag } from "@bitwarden/common/enums/feature-flag.enum";
 import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
+import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import {
  VaultTimeout,
  VaultTimeoutAction,
--- a/apps/desktop/src/app/app.module.ts
+++ b/apps/desktop/src/app/app.module.ts
@@ -13,7 +13,6 @@ import { DecryptionFailureDialogComponent } from "@bitwarden/vault";
 import { AccessibilityCookieComponent } from "../auth/accessibility-cookie.component";
 import { DeleteAccountComponent } from "../auth/delete-account.component";
 import { EnvironmentComponent } from "../auth/environment.component";
-import { HintComponent } from "../auth/hint.component";
 import { LoginModule } from "../auth/login/login.module";
 import { RemovePasswordComponent } from "../auth/remove-password.component";
 import { SetPasswordComponent } from "../auth/set-password.component";
@@ -74,7 +73,6 @@ import { SharedModule } from "./shared/shared.module";
    EnvironmentComponent,
    FolderAddEditComponent,
    HeaderComponent,
-    HintComponent,
    PasswordHistoryComponent,
    PremiumComponent,
    RemovePasswordComponent,
--- a/apps/desktop/src/auth/hint.component.html
+++ b/apps/desktop/src/auth/hint.component.html
@@ -1,32 +0,0 @@
-<form id="hint-page" #form (ngSubmit)="submit()" [appApiAction]="formPromise">
-  <div class="content">
-    <h1>{{ "passwordHint" | i18n }}</h1>
-    <div class="box last">
-      <div class="box-content">
-        <div class="box-content-row" appBoxRow>
-          <label for="email">{{ "emailAddress" | i18n }}</label>
-          <input
-            id="email"
-            type="text"
-            name="Email"
-            aria-describedby="emailHelp"
-            [(ngModel)]="email"
-            required
-            appAutofocus
-            appInputVerbatim
-          />
-        </div>
-      </div>
-      <div id="emailHelp" class="box-footer">
-        {{ "enterEmailToGetHint" | i18n }}
-      </div>
-    </div>
-    <div class="buttons">
-      <button type="submit" class="btn primary block" [disabled]="form.loading">
-        <b [hidden]="form.loading">{{ "submit" | i18n }}</b>
-        <i class="bwi bwi-spinner bwi-spin" [hidden]="!form.loading" aria-hidden="true"></i>
-      </button>
-      <button type="button" routerLink="/login" class="btn block">{{ "cancel" | i18n }}</button>
-    </div>
-  </div>
-</form>
--- a/apps/desktop/src/auth/hint.component.ts
+++ b/apps/desktop/src/auth/hint.component.ts
@@ -1,36 +0,0 @@
-import { Component } from "@angular/core";
-import { Router } from "@angular/router";
-
-import { HintComponent as BaseHintComponent } from "@bitwarden/angular/auth/components/hint.component";
-import { LoginEmailServiceAbstraction } from "@bitwarden/auth/common";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { ToastService } from "@bitwarden/components";
-
-@Component({
-  selector: "app-hint",
-  templateUrl: "hint.component.html",
-})
-export class HintComponent extends BaseHintComponent {
-  constructor(
-    router: Router,
-    platformUtilsService: PlatformUtilsService,
-    i18nService: I18nService,
-    apiService: ApiService,
-    logService: LogService,
-    loginEmailService: LoginEmailServiceAbstraction,
-    toastService: ToastService,
-  ) {
-    super(
-      router,
-      i18nService,
-      apiService,
-      platformUtilsService,
-      logService,
-      loginEmailService,
-      toastService,
-    );
-  }
-}
--- a/apps/desktop/src/locales/en/messages.json
+++ b/apps/desktop/src/locales/en/messages.json
@@ -748,12 +748,6 @@
  "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
    "message": "Enter your account email address and your password hint will be sent to you"
  },
-  "passwordHint": {
-    "message": "Password hint"
-  },
-  "enterEmailToGetHint": {
-    "message": "Enter your account email address to receive your master password hint."
-  },
  "getMasterPasswordHint": {
    "message": "Get master password hint"
  },
--- a/apps/desktop/src/platform/services/electron-platform-utils.service.ts
+++ b/apps/desktop/src/platform/services/electron-platform-utils.service.ts
@@ -77,11 +77,9 @@ export class ElectronPlatformUtilsService implements PlatformUtilsService {
    return (await this.getApplicationVersion()).split(/[+|-]/)[0].trim();
  }

-  // Restricted to Windows and Mac. Mac is missing support for pin entry, and Linux is missing support entirely and has to be implemented in another way.
+  // Linux and Mac are missing a ui to enter a pin, so this works for two-factor security keys, when always-uv is not active
  supportsWebAuthn(win: Window): boolean {
-    return (
-      this.getDevice() === DeviceType.WindowsDesktop || this.getDevice() === DeviceType.MacOsDesktop
-    );
+    return true;
  }

  supportsDuo(): boolean {
--- a/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/group-add-edit.component.html
@@ -9,7 +9,7 @@
    <div bitDialogContent>
      <div *ngIf="loading">
        <i
-          class="bwi bwi-spinner bwi-spin text-muted"
+          class="bwi bwi-spinner bwi-spin tw-text-muted"
          title="{{ 'loading' | i18n }}"
          aria-hidden="true"
        ></i>
--- a/apps/web/src/app/admin-console/organizations/manage/groups.component.html
+++ b/apps/web/src/app/admin-console/organizations/manage/groups.component.html
@@ -12,7 +12,7 @@

 <ng-container *ngIf="loading">
  <i
-    class="bwi bwi-spinner bwi-spin text-muted"
+    class="bwi bwi-spinner bwi-spin tw-text-muted"
    title="{{ 'loading' | i18n }}"
    aria-hidden="true"
  ></i>
--- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-status.component.html
@@ -18,7 +18,9 @@
          </td>
          <td bitCell>
            {{ item.user.email }}
-            <small class="text-muted d-block" *ngIf="item.user.name">{{ item.user.name }}</small>
+            <small class="tw-text-muted tw-block" *ngIf="item.user.name">{{
+              item.user.name
+            }}</small>
          </td>
          <td class="tw-text-danger" *ngIf="item.error" bitCell>
            {{ item.message }}
--- a/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/components/member-dialog/member-dialog.component.html
@@ -12,7 +12,7 @@
    <div bitDialogContent>
      <ng-container *ngIf="loading">
        <i
-          class="bwi bwi-spinner bwi-spin text-muted"
+          class="bwi bwi-spinner bwi-spin tw-text-muted"
          title="{{ 'loading' | i18n }}"
          aria-hidden="true"
        ></i>
--- a/apps/web/src/app/admin-console/organizations/members/members.component.html
+++ b/apps/web/src/app/admin-console/organizations/members/members.component.html
@@ -48,7 +48,7 @@
 </div>
 <ng-container *ngIf="!firstLoaded">
  <i
-    class="bwi bwi-spinner bwi-spin text-muted"
+    class="bwi bwi-spinner bwi-spin tw-text-muted"
    title="{{ 'loading' | i18n }}"
    aria-hidden="true"
  ></i>
--- a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.html
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.html
@@ -1,13 +1,13 @@
-<div class="mt-5 d-flex justify-content-center" *ngIf="loading">
+<div class="tw-mt-10 tw-flex tw-justify-center" *ngIf="loading">
  <div>
-    <img class="mb-4 logo logo-themed" alt="Bitwarden" />
-    <p class="text-center">
+    <bit-icon class="tw-w-72 tw-block tw-mb-4" [icon]="logo"></bit-icon>
+    <div class="tw-flex tw-justify-center">
      <i
-        class="bwi bwi-spinner bwi-spin bwi-2x text-muted"
+        class="bwi bwi-spinner bwi-spin bwi-2x tw-text-muted"
        title="{{ 'loading' | i18n }}"
        aria-hidden="true"
      ></i>
      <span class="tw-sr-only">{{ "loading" | i18n }}</span>
-    </p>
+    </div>
  </div>
 </div>
--- a/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/accept-family-sponsorship.component.ts
@@ -3,6 +3,7 @@
 import { Component, inject } from "@angular/core";
 import { Params } from "@angular/router";

+import { BitwardenLogo } from "@bitwarden/auth/angular";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { OrganizationSponsorshipResponse } from "@bitwarden/common/admin-console/models/response/organization-sponsorship.response";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
@@ -20,6 +21,7 @@ import { BaseAcceptComponent } from "../../../common/base.accept.component";
  templateUrl: "accept-family-sponsorship.component.html",
 })
 export class AcceptFamilySponsorshipComponent extends BaseAcceptComponent {
+  protected logo = BitwardenLogo;
  failedShortMessage = "inviteAcceptFailedShort";
  failedMessage = "inviteAcceptFailed";

--- a/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.html
+++ b/apps/web/src/app/admin-console/organizations/sponsorships/families-for-enterprise-setup.component.html
@@ -29,7 +29,7 @@
    <div *ngIf="showNewOrganization">
      <app-organization-plans></app-organization-plans>
    </div>
-    <div class="w-1/2" *ngIf="!showNewOrganization">
+    <div class="tw-w-1/2" *ngIf="!showNewOrganization">
      <button bitButton buttonType="primary" bitFormButton type="submit">
        {{ "acceptOffer" | i18n }}
      </button>
--- a/apps/web/src/app/app.component.ts
+++ b/apps/web/src/app/app.component.ts
@@ -16,10 +16,10 @@ import { InternalOrganizationServiceAbstraction } from "@bitwarden/common/admin-
 import { InternalPolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { AuthService } from "@bitwarden/common/auth/abstractions/auth.service";
-import { KeyConnectorService } from "@bitwarden/common/auth/abstractions/key-connector.service";
 import { AuthenticationStatus } from "@bitwarden/common/auth/enums/authentication-status";
 import { getUserId } from "@bitwarden/common/auth/services/account.service";
 import { ProcessReloadServiceAbstraction } from "@bitwarden/common/key-management/abstractions/process-reload.service";
+import { KeyConnectorService } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
 import { VaultTimeoutService } from "@bitwarden/common/key-management/vault-timeout";
 import { AppIdService } from "@bitwarden/common/platform/abstractions/app-id.service";
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
--- a/apps/web/src/app/auth/hint.component.html
+++ b/apps/web/src/app/auth/hint.component.html
@@ -1,23 +0,0 @@
-<form [bitSubmit]="submit" [formGroup]="formGroup">
-  <bit-form-field>
-    <bit-label>{{ "emailAddress" | i18n }}</bit-label>
-    <input
-      bitInput
-      appAutofocus
-      inputmode="email"
-      appInputVerbatim="false"
-      type="email"
-      formControlName="email"
-    />
-    <bit-hint>{{ "enterEmailToGetHint" | i18n }}</bit-hint>
-  </bit-form-field>
-  <hr />
-  <div class="tw-flex tw-gap-2">
-    <button type="submit" bitButton bitFormButton buttonType="primary" [block]="true">
-      {{ "submit" | i18n }}
-    </button>
-    <a bitButton buttonType="secondary" routerLink="/login" [block]="true">
-      {{ "cancel" | i18n }}
-    </a>
-  </div>
-</form>
--- a/apps/web/src/app/auth/hint.component.ts
+++ b/apps/web/src/app/auth/hint.component.ts
@@ -1,64 +0,0 @@
-// FIXME: Update this file to be type safe and remove this and next line
-// @ts-strict-ignore
-import { Component, OnInit } from "@angular/core";
-import { FormBuilder, Validators } from "@angular/forms";
-import { Router } from "@angular/router";
-
-import { HintComponent as BaseHintComponent } from "@bitwarden/angular/auth/components/hint.component";
-import { LoginEmailServiceAbstraction } from "@bitwarden/auth/common";
-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
-import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
-import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
-import { ToastService } from "@bitwarden/components";
-
-@Component({
-  selector: "app-hint",
-  templateUrl: "hint.component.html",
-})
-export class HintComponent extends BaseHintComponent implements OnInit {
-  formGroup = this.formBuilder.group({
-    email: ["", [Validators.email, Validators.required]],
-  });
-
-  get emailFormControl() {
-    return this.formGroup.controls.email;
-  }
-
-  constructor(
-    router: Router,
-    i18nService: I18nService,
-    apiService: ApiService,
-    platformUtilsService: PlatformUtilsService,
-    logService: LogService,
-    loginEmailService: LoginEmailServiceAbstraction,
-    private formBuilder: FormBuilder,
-    protected toastService: ToastService,
-  ) {
-    super(
-      router,
-      i18nService,
-      apiService,
-      platformUtilsService,
-      logService,
-      loginEmailService,
-      toastService,
-    );
-  }
-
-  async ngOnInit(): Promise<void> {
-    await super.ngOnInit();
-    this.emailFormControl.setValue(this.email);
-  }
-
-  // Wrapper method to call super.submit() since properties (e.g., submit) cannot use super directly
-  // This is because properties are assigned per type and generally don't have access to the prototype
-  async superSubmit() {
-    await super.submit();
-  }
-
-  submit = async () => {
-    this.email = this.emailFormControl.value;
-    await this.superSubmit();
-  };
-}
--- a/apps/web/src/app/shared/loose-components.module.ts
+++ b/apps/web/src/app/shared/loose-components.module.ts
@@ -12,7 +12,6 @@ import { EventsComponent as OrgEventsComponent } from "../admin-console/organiza
 import { UserConfirmComponent as OrgUserConfirmComponent } from "../admin-console/organizations/manage/user-confirm.component";
 import { VerifyRecoverDeleteOrgComponent } from "../admin-console/organizations/manage/verify-recover-delete-org.component";
 import { AcceptFamilySponsorshipComponent } from "../admin-console/organizations/sponsorships/accept-family-sponsorship.component";
-import { HintComponent } from "../auth/hint.component";
 import { RecoverDeleteComponent } from "../auth/recover-delete.component";
 import { RecoverTwoFactorComponent } from "../auth/recover-two-factor.component";
 import { RemovePasswordComponent } from "../auth/remove-password.component";
@@ -126,7 +125,6 @@ import { SharedModule } from "./shared.module";
    EmergencyAccessViewComponent,
    FolderAddEditComponent,
    FrontendLayoutComponent,
-    HintComponent,
    OrgAddEditComponent,
    OrgAttachmentsComponent,
    OrgEventsComponent,
@@ -188,7 +186,6 @@ import { SharedModule } from "./shared.module";
    EmergencyAccessViewComponent,
    FolderAddEditComponent,
    FrontendLayoutComponent,
-    HintComponent,
    OrgAddEditComponent,
    OrganizationLayoutComponent,
    OrgAttachmentsComponent,
--- a/apps/web/src/locales/en/messages.json
+++ b/apps/web/src/locales/en/messages.json
@@ -1307,12 +1307,6 @@
  "enterYourAccountEmailAddressAndYourPasswordHintWillBeSentToYou": {
    "message": "Enter your account email address and your password hint will be sent to you"
  },
-  "passwordHint": {
-    "message": "Password hint"
-  },
-  "enterEmailToGetHint": {
-    "message": "Enter your account email address to receive your master password hint."
-  },
  "getMasterPasswordHint": {
    "message": "Get master password hint"
  },