merge main, fix conflicts

2026-01-06 10:33:57 +00:00 · 2024-09-05 16:53:32 -07:00
parent 1ad35b0308 8eef46ad4e
commit d74561d374
300 changed files with 5977 additions and 2162 deletions
--- a/apps/web/src/app/auth/hint.component.ts
+++ b/apps/web/src/app/auth/hint.component.ts
@@ -44,8 +44,8 @@ export class HintComponent extends BaseHintComponent implements OnInit {
    );
  }

-  ngOnInit(): void {
-    super.ngOnInit();
+  async ngOnInit(): Promise<void> {
+    await super.ngOnInit();
    this.emailFormControl.setValue(this.email);
  }

--- a/apps/web/src/app/auth/key-rotation/request/update-key.request.ts
+++ b/apps/web/src/app/auth/key-rotation/request/update-key.request.ts
@@ -1,4 +1,4 @@
-import { OrganizationUserResetPasswordWithIdRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests";
+import { OrganizationUserResetPasswordWithIdRequest } from "@bitwarden/admin-console/common";
 import { WebauthnRotateCredentialRequest } from "@bitwarden/common/auth/models/request/webauthn-rotate-credential.request";
 import { SendWithIdRequest } from "@bitwarden/common/src/tools/send/models/request/send-with-id.request";
 import { CipherWithIdRequest } from "@bitwarden/common/src/vault/models/request/cipher-with-id.request";
--- a/apps/web/src/app/auth/key-rotation/user-key-rotation.service.spec.ts
+++ b/apps/web/src/app/auth/key-rotation/user-key-rotation.service.spec.ts
@@ -1,7 +1,7 @@
 import { mock, MockProxy } from "jest-mock-extended";
 import { BehaviorSubject } from "rxjs";

-import { OrganizationUserResetPasswordWithIdRequest } from "@bitwarden/common/admin-console/abstractions/organization-user/requests";
+import { OrganizationUserResetPasswordWithIdRequest } from "@bitwarden/admin-console/common";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/auth/abstractions/device-trust.service.abstraction";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { WebauthnRotateCredentialRequest } from "@bitwarden/common/auth/models/request/webauthn-rotate-credential.request";
--- a/apps/web/src/app/auth/organization-invite/accept-organization.service.spec.ts
+++ b/apps/web/src/app/auth/organization-invite/accept-organization.service.spec.ts
@@ -1,9 +1,9 @@
 import { FakeGlobalStateProvider } from "@bitwarden/common/../spec/fake-state-provider";
 import { MockProxy, mock } from "jest-mock-extended";

+import { OrganizationUserApiService } from "@bitwarden/admin-console/common";
 import { ApiService } from "@bitwarden/common/abstractions/api.service";
 import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
-import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
@@ -35,7 +35,7 @@ describe("AcceptOrganizationInviteService", () => {
  let policyService: MockProxy<PolicyService>;
  let logService: MockProxy<LogService>;
  let organizationApiService: MockProxy<OrganizationApiServiceAbstraction>;
-  let organizationUserService: MockProxy<OrganizationUserService>;
+  let organizationUserApiService: MockProxy<OrganizationUserApiService>;
  let i18nService: MockProxy<I18nService>;
  let globalStateProvider: FakeGlobalStateProvider;
  let globalState: FakeGlobalState<OrganizationInvite>;
@@ -49,7 +49,7 @@ describe("AcceptOrganizationInviteService", () => {
    policyService = mock();
    logService = mock();
    organizationApiService = mock();
-    organizationUserService = mock();
+    organizationUserApiService = mock();
    i18nService = mock();
    globalStateProvider = new FakeGlobalStateProvider();
    globalState = globalStateProvider.getFake(ORGANIZATION_INVITE);
@@ -63,7 +63,7 @@ describe("AcceptOrganizationInviteService", () => {
      policyService,
      logService,
      organizationApiService,
-      organizationUserService,
+      organizationUserApiService,
      i18nService,
      globalStateProvider,
    );
@@ -85,10 +85,10 @@ describe("AcceptOrganizationInviteService", () => {
      const result = await sut.validateAndAcceptInvite(invite);

      expect(result).toBe(true);
-      expect(organizationUserService.postOrganizationUserAcceptInit).toHaveBeenCalled();
+      expect(organizationUserApiService.postOrganizationUserAcceptInit).toHaveBeenCalled();
      expect(apiService.refreshIdentityToken).toHaveBeenCalled();
      expect(globalState.nextMock).toHaveBeenCalledWith(null);
-      expect(organizationUserService.postOrganizationUserAccept).not.toHaveBeenCalled();
+      expect(organizationUserApiService.postOrganizationUserAccept).not.toHaveBeenCalled();
      expect(authService.logOut).not.toHaveBeenCalled();
    });

@@ -133,10 +133,10 @@ describe("AcceptOrganizationInviteService", () => {
      const result = await sut.validateAndAcceptInvite(invite);

      expect(result).toBe(true);
-      expect(organizationUserService.postOrganizationUserAccept).toHaveBeenCalled();
+      expect(organizationUserApiService.postOrganizationUserAccept).toHaveBeenCalled();
      expect(apiService.refreshIdentityToken).toHaveBeenCalled();
      expect(globalState.nextMock).toHaveBeenCalledWith(null);
-      expect(organizationUserService.postOrganizationUserAcceptInit).not.toHaveBeenCalled();
+      expect(organizationUserApiService.postOrganizationUserAcceptInit).not.toHaveBeenCalled();
      expect(authService.logOut).not.toHaveBeenCalled();
    });

@@ -161,8 +161,8 @@ describe("AcceptOrganizationInviteService", () => {
      const result = await sut.validateAndAcceptInvite(invite);

      expect(result).toBe(true);
-      expect(organizationUserService.postOrganizationUserAccept).toHaveBeenCalled();
-      expect(organizationUserService.postOrganizationUserAcceptInit).not.toHaveBeenCalled();
+      expect(organizationUserApiService.postOrganizationUserAccept).toHaveBeenCalled();
+      expect(organizationUserApiService.postOrganizationUserAcceptInit).not.toHaveBeenCalled();
      expect(authService.logOut).not.toHaveBeenCalled();
    });
  });
--- a/apps/web/src/app/auth/organization-invite/accept-organization.service.ts
+++ b/apps/web/src/app/auth/organization-invite/accept-organization.service.ts
@@ -1,13 +1,13 @@
 import { Injectable } from "@angular/core";
 import { BehaviorSubject, firstValueFrom, map } from "rxjs";

-import { ApiService } from "@bitwarden/common/abstractions/api.service";
-import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
-import { OrganizationUserService } from "@bitwarden/common/admin-console/abstractions/organization-user/organization-user.service";
 import {
+  OrganizationUserApiService,
  OrganizationUserAcceptRequest,
  OrganizationUserAcceptInitRequest,
-} from "@bitwarden/common/admin-console/abstractions/organization-user/requests";
+} from "@bitwarden/admin-console/common";
+import { ApiService } from "@bitwarden/common/abstractions/api.service";
+import { OrganizationApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/organization/organization-api.service.abstraction";
 import { PolicyApiServiceAbstraction } from "@bitwarden/common/admin-console/abstractions/policy/policy-api.service.abstraction";
 import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
 import { PolicyType } from "@bitwarden/common/admin-console/enums";
@@ -58,7 +58,7 @@ export class AcceptOrganizationInviteService {
    private readonly policyService: PolicyService,
    private readonly logService: LogService,
    private readonly organizationApiService: OrganizationApiServiceAbstraction,
-    private readonly organizationUserService: OrganizationUserService,
+    private readonly organizationUserApiService: OrganizationUserApiService,
    private readonly i18nService: I18nService,
    private readonly globalStateProvider: GlobalStateProvider,
  ) {
@@ -121,7 +121,7 @@ export class AcceptOrganizationInviteService {

  private async acceptAndInitOrganization(invite: OrganizationInvite): Promise<void> {
    await this.prepareAcceptAndInitRequest(invite).then((request) =>
-      this.organizationUserService.postOrganizationUserAcceptInit(
+      this.organizationUserApiService.postOrganizationUserAcceptInit(
        invite.organizationId,
        invite.organizationUserId,
        request,
@@ -156,7 +156,7 @@ export class AcceptOrganizationInviteService {

  private async accept(invite: OrganizationInvite): Promise<void> {
    await this.prepareAcceptRequest(invite).then((request) =>
-      this.organizationUserService.postOrganizationUserAccept(
+      this.organizationUserApiService.postOrganizationUserAccept(
        invite.organizationId,
        invite.organizationUserId,
        request,
--- a/apps/web/src/app/auth/settings/two-factor-setup.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor-setup.component.ts
@@ -220,7 +220,7 @@ export class TwoFactorSetupComponent implements OnInit, OnDestroy {
          this.dialogService,
          { data: result },
        );
-        this.twoFactorSetupSubscription = webAuthnComp.componentInstance.onChangeStatus
+        this.twoFactorSetupSubscription = webAuthnComp.componentInstance.onUpdated
          .pipe(first(), takeUntil(this.destroy$))
          .subscribe((enabled: boolean) => {
            webAuthnComp.close();
--- a/apps/web/src/app/auth/settings/two-factor-webauthn.component.ts
+++ b/apps/web/src/app/auth/settings/two-factor-webauthn.component.ts
@@ -1,5 +1,5 @@
 import { DIALOG_DATA, DialogConfig, DialogRef } from "@angular/cdk/dialog";
-import { Component, EventEmitter, Inject, NgZone, Output } from "@angular/core";
+import { Component, Inject, NgZone } from "@angular/core";
 import { FormControl, FormGroup } from "@angular/forms";

 import { ApiService } from "@bitwarden/common/abstractions/api.service";
@@ -33,7 +33,6 @@ interface Key {
  templateUrl: "two-factor-webauthn.component.html",
 })
 export class TwoFactorWebAuthnComponent extends TwoFactorBaseComponent {
-  @Output() onChangeStatus = new EventEmitter<boolean>();
  type = TwoFactorProviderType.WebAuthn;
  name: string;
  keys: Key[];
@@ -85,34 +84,33 @@ export class TwoFactorWebAuthnComponent extends TwoFactorBaseComponent {
      // Should never happen.
      return Promise.reject();
    }
+    return this.enable();
+  };
+
+  protected async enable() {
    const request = await this.buildRequestModel(UpdateTwoFactorWebAuthnRequest);
    request.deviceResponse = this.webAuthnResponse;
    request.id = this.keyIdAvailable;
    request.name = this.formGroup.value.name;

-    return this.enableWebAuth(request);
-  };
-
-  private enableWebAuth(request: any) {
-    return super.enable(async () => {
-      this.formPromise = this.apiService.putTwoFactorWebAuthn(request);
-      const response = await this.formPromise;
-      this.processResponse(response);
+    const response = await this.apiService.putTwoFactorWebAuthn(request);
+    this.processResponse(response);
+    this.toastService.showToast({
+      title: this.i18nService.t("success"),
+      message: this.i18nService.t("twoFactorProviderEnabled"),
+      variant: "success",
    });
+    this.onUpdated.emit(response.enabled);
  }

  disable = async () => {
-    await this.disableWebAuth();
+    await this.disableMethod();
    if (!this.enabled) {
-      this.onChangeStatus.emit(this.enabled);
+      this.onUpdated.emit(this.enabled);
      this.dialogRef.close();
    }
  };

-  private async disableWebAuth() {
-    return super.disable(this.formPromise);
-  }
-
  async remove(key: Key) {
    if (this.keysConfiguredCount <= 1 || key.removePromise != null) {
      return;
@@ -208,7 +206,7 @@ export class TwoFactorWebAuthnComponent extends TwoFactorBaseComponent {
      }
    }
    this.enabled = response.enabled;
-    this.onChangeStatus.emit(this.enabled);
+    this.onUpdated.emit(this.enabled);
  }

  static open(
--- a/apps/web/src/app/auth/two-factor.component.html
+++ b/apps/web/src/app/auth/two-factor.component.html
@@ -36,7 +36,7 @@
        <img src="../../images/yubikey.jpg" class="tw-rounded img-fluid tw-mb-3" alt="" />
      </picture>
      <bit-form-field>
-        <bit-label class="tw-sr-only">{{ "verificationCode" | i18n }}</bit-label>
+        <bit-label>{{ "verificationCode" | i18n }}</bit-label>
        <input type="password" bitInput formControlName="token" appAutofocus appInputVerbatim />
      </bit-form-field>
    </ng-container>