From 2efe985e137c4d2b1dc3693bc8f15507e8a823c1 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Fri, 12 Dec 2025 17:14:38 +0100 Subject: [PATCH] Fix build --- .../organization-user-reset-password.service.ts | 12 +++++------- .../response/webauthn-login-credential.response.ts | 3 ++- .../webauthn-login/webauthn-login-admin.service.ts | 4 ++-- .../providers/manage/members.component.ts | 2 +- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.ts b/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.ts index df5e7e8a25c..fb140862282 100644 --- a/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.ts +++ b/apps/web/src/app/admin-console/organizations/members/services/organization-user-reset-password/organization-user-reset-password.service.ts @@ -13,10 +13,7 @@ import { OrganizationService } from "@bitwarden/common/admin-console/abstraction import { AccountService } from "@bitwarden/common/auth/abstractions/account.service"; import { getUserId } from "@bitwarden/common/auth/services/account.service"; import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service"; -import { - EncryptedString, - EncString, -} from "@bitwarden/common/key-management/crypto/models/enc-string"; +import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string"; import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service"; import { Utils } from "@bitwarden/common/platform/misc/utils"; import { OrganizationId, UserId } from "@bitwarden/common/types/guid"; @@ -29,6 +26,7 @@ import { KeyService, KdfType, } from "@bitwarden/key-management"; +import { UnsignedSharedKey } from "@bitwarden/sdk-internal"; import { OrganizationUserResetPasswordEntry } from "./organization-user-reset-password-entry"; @@ -63,7 +61,7 @@ export class OrganizationUserResetPasswordService orgId: string, userKey: UserKey, trustedPublicKeys: Uint8Array[], - ): Promise { + ): Promise { if (userKey == null) { throw new Error("User key is required for recovery."); } @@ -87,7 +85,7 @@ export class OrganizationUserResetPasswordService // RSA Encrypt user key with organization's public key const encryptedKey = await this.encryptService.encapsulateKeyUnsigned(userKey, publicKey); - return encryptedKey.encryptedString; + return encryptedKey; } /** @@ -132,7 +130,7 @@ export class OrganizationUserResetPasswordService // Decrypt User's Reset Password Key to get UserKey const userKey = await this.encryptService.decapsulateKeyUnsigned( - new EncString(response.resetPasswordKey), + response.resetPasswordKey, decPrivateKey, ); const existingUserKey = userKey as UserKey; diff --git a/apps/web/src/app/auth/core/services/webauthn-login/response/webauthn-login-credential.response.ts b/apps/web/src/app/auth/core/services/webauthn-login/response/webauthn-login-credential.response.ts index 603e0f2a77d..297cff0fe9a 100644 --- a/apps/web/src/app/auth/core/services/webauthn-login/response/webauthn-login-credential.response.ts +++ b/apps/web/src/app/auth/core/services/webauthn-login/response/webauthn-login-credential.response.ts @@ -3,6 +3,7 @@ import { EncString } from "@bitwarden/common/key-management/crypto/models/enc-string"; import { RotateableKeySet } from "@bitwarden/common/key-management/keys/models/rotateable-key-set"; import { BaseResponse } from "@bitwarden/common/models/response/base.response"; +import { UnsignedSharedKey } from "@bitwarden/sdk-internal"; import { WebauthnLoginCredentialPrfStatus } from "../../../enums/webauthn-login-credential-prf-status.enum"; @@ -14,7 +15,7 @@ export class WebauthnLoginCredentialResponse extends BaseResponse { name: string; prfStatus: WebauthnLoginCredentialPrfStatus; encryptedPublicKey?: string; - encryptedUserKey?: string; + encryptedUserKey?: UnsignedSharedKey; constructor(response: unknown) { super(response); diff --git a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts index 7765d01f75c..b7febe802ac 100644 --- a/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts +++ b/apps/web/src/app/auth/core/services/webauthn-login/webauthn-login-admin.service.ts @@ -204,7 +204,7 @@ export class WebauthnLoginAdminService request.token = credential.createOptions.token; request.name = name; request.supportsPrf = credential.supportsPrf; - request.encryptedUserKey = prfKeySet?.encapsulatedDownstreamKey.encryptedString; + request.encryptedUserKey = prfKeySet?.encapsulatedDownstreamKey; request.encryptedPublicKey = prfKeySet?.encryptedPublicKey.encryptedString; request.encryptedPrivateKey = prfKeySet?.encryptedPrivateKey.encryptedString; await this.apiService.saveCredential(request); @@ -242,7 +242,7 @@ export class WebauthnLoginAdminService const request = new EnableCredentialEncryptionRequest(); request.token = assertionOptions.token; request.deviceResponse = assertionOptions.deviceResponse; - request.encryptedUserKey = prfKeySet.encapsulatedDownstreamKey.encryptedString; + request.encryptedUserKey = prfKeySet.encapsulatedDownstreamKey; request.encryptedPublicKey = prfKeySet.encryptedPublicKey.encryptedString; request.encryptedPrivateKey = prfKeySet.encryptedPrivateKey.encryptedString; await this.apiService.updateCredential(request); diff --git a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts index 6e9209be882..7d60dbdec97 100644 --- a/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts +++ b/bitwarden_license/bit-web/src/app/admin-console/providers/manage/members.component.ts @@ -277,7 +277,7 @@ export class MembersComponent extends BaseMembersComponent { const key = await this.encryptService.encapsulateKeyUnsigned(providerKey, publicKey); const request = new ProviderUserConfirmRequest(); - request.key = key.encryptedString; + request.key = key; await this.apiService.postProviderUserConfirm(this.providerId, user.id, request); return { success: true }; } catch (error) {