From 012de1b92fadc8683eb186fbf0c25c680fe882eb Mon Sep 17 00:00:00 2001 From: Jacob Fink Date: Fri, 9 Jun 2023 10:52:40 -0400 Subject: [PATCH] fix typing of bulk confirm component --- .../members/components/bulk/bulk-confirm.component.ts | 3 ++- .../providers/manage/bulk/bulk-confirm.component.ts | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.ts b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.ts index 669a8954eee..88eeb6036c3 100644 --- a/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.ts +++ b/apps/web/src/app/admin-console/organizations/members/components/bulk/bulk-confirm.component.ts @@ -7,6 +7,7 @@ import { OrganizationUserStatusType } from "@bitwarden/common/admin-console/enum import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { BulkUserDetails } from "./bulk-status.component"; @@ -98,7 +99,7 @@ export class BulkConfirmComponent implements OnInit { ); } - protected getCryptoKey() { + protected getCryptoKey(): Promise { return this.cryptoService.getOrgKey(this.organizationId); } diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/bulk/bulk-confirm.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/bulk/bulk-confirm.component.ts index 6b3fdd75c43..e14983d4ec9 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/bulk/bulk-confirm.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/bulk/bulk-confirm.component.ts @@ -3,6 +3,7 @@ import { Component, Input } from "@angular/core"; import { ProviderUserStatusType } from "@bitwarden/common/admin-console/enums"; import { ProviderUserBulkConfirmRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk-confirm.request"; import { ProviderUserBulkRequest } from "@bitwarden/common/admin-console/models/request/provider/provider-user-bulk.request"; +import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key"; import { BulkConfirmComponent as OrganizationBulkConfirmComponent } from "@bitwarden/web-vault/app/admin-console/organizations/members/components/bulk/bulk-confirm.component"; import { BulkUserDetails } from "@bitwarden/web-vault/app/admin-console/organizations/members/components/bulk/bulk-status.component"; @@ -13,20 +14,20 @@ import { BulkUserDetails } from "@bitwarden/web-vault/app/admin-console/organiza export class BulkConfirmComponent extends OrganizationBulkConfirmComponent { @Input() providerId: string; - protected isAccepted(user: BulkUserDetails) { + protected override isAccepted(user: BulkUserDetails) { return user.status === ProviderUserStatusType.Accepted; } - protected async getPublicKeys() { + protected override async getPublicKeys() { const request = new ProviderUserBulkRequest(this.filteredUsers.map((user) => user.id)); return await this.apiService.postProviderUsersPublicKey(this.providerId, request); } - protected getCryptoKey() { + protected override getCryptoKey(): Promise { return this.cryptoService.getProviderKey(this.providerId); } - protected async postConfirmRequest(userIdsWithKeys: any[]) { + protected override async postConfirmRequest(userIdsWithKeys: any[]) { const request = new ProviderUserBulkConfirmRequest(userIdsWithKeys); return await this.apiService.postProviderUserBulkConfirm(this.providerId, request); }