From 58f4fdd153df913d960ce78d7e7aa306a611b5e9 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Thu, 24 Apr 2025 22:03:14 +0200 Subject: [PATCH] Fix remaining changes --- .../services/local-backed-session-storage.service.spec.ts | 7 +++++-- .../accept-organization.service.spec.ts | 2 +- .../src/app/secrets-manager/projects/project.service.ts | 2 +- .../src/app/secrets-manager/secrets/secret.service.ts | 6 +++--- .../service-accounts/service-account.service.ts | 5 ++++- .../services/default-vnext-collection.service.spec.ts | 2 -- ...fault-user-asymmetric-key-regeneration.service.spec.ts | 8 +++++--- 7 files changed, 19 insertions(+), 13 deletions(-) diff --git a/apps/browser/src/platform/services/local-backed-session-storage.service.spec.ts b/apps/browser/src/platform/services/local-backed-session-storage.service.spec.ts index 854614bbdf7..3a8aaf76bde 100644 --- a/apps/browser/src/platform/services/local-backed-session-storage.service.spec.ts +++ b/apps/browser/src/platform/services/local-backed-session-storage.service.spec.ts @@ -127,7 +127,7 @@ describe("LocalBackedSessionStorage", () => { describe("save", () => { const encString = makeEncString("encrypted"); beforeEach(() => { - encryptService.encrypt.mockResolvedValue(encString); + encryptService.encryptString.mockResolvedValue(encString); }); it("logs a warning when saving the same value twice and in a dev environment", async () => { @@ -157,7 +157,10 @@ describe("LocalBackedSessionStorage", () => { it("encrypts and saves the value to local storage", async () => { await sut.save("test", "value"); - expect(encryptService.encrypt).toHaveBeenCalledWith(JSON.stringify("value"), sessionKey); + expect(encryptService.encryptString).toHaveBeenCalledWith( + JSON.stringify("value"), + sessionKey, + ); expect(localStorage.internalStore["session_test"]).toEqual(encString.encryptedString); }); diff --git 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 index 0a30aa16478..253328b0c04 100644 --- 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 @@ -95,7 +95,7 @@ describe("AcceptOrganizationInviteService", () => { encryptService.wrapDecapsulationKey.mockResolvedValue({ encryptedString: "string", } as EncString); - encryptService.encrypt.mockResolvedValue({ encryptedString: "string" } as EncString); + encryptService.encryptString.mockResolvedValue({ encryptedString: "string" } as EncString); const invite = createOrgInvite({ initOrganization: true }); const result = await sut.validateAndAcceptInvite(invite); diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project.service.ts index 3d2a569ef74..334d9ea43a6 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/projects/project.service.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/projects/project.service.ts @@ -93,7 +93,7 @@ export class ProjectService { ): Promise { const orgKey = await this.getOrganizationKey(organizationId); const request = new ProjectRequest(); - request.name = await this.encryptService.encryptStringprojectView.name, orgKey); + request.name = await this.encryptService.encryptString(projectView.name, orgKey); return request; } diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secret.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secret.service.ts index 888bf44c410..cf71de288bb 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secret.service.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/secrets/secret.service.ts @@ -166,9 +166,9 @@ export class SecretService { const orgKey = await this.getOrganizationKey(organizationId); const request = new SecretRequest(); const [key, value, note] = await Promise.all([ - this.encryptService.encrypt(secretView.name, orgKey), - this.encryptService.encrypt(secretView.value, orgKey), - this.encryptService.encrypt(secretView.note, orgKey), + this.encryptService.encryptString(secretView.name, orgKey), + this.encryptService.encryptString(secretView.value, orgKey), + this.encryptService.encryptString(secretView.note, orgKey), ]); request.key = key.encryptedString; request.value = value.encryptedString; diff --git a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts index fc7e4aeb472..c5d4f979ef4 100644 --- a/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts +++ b/bitwarden_license/bit-web/src/app/secrets-manager/service-accounts/service-account.service.ts @@ -130,7 +130,10 @@ export class ServiceAccountService { serviceAccountView: ServiceAccountView, ) { const request = new ServiceAccountRequest(); - request.name = await this.encryptService.encryptStringserviceAccountView.name, organizationKey); + request.name = await this.encryptService.encryptString( + serviceAccountView.name, + organizationKey, + ); return request; } diff --git a/libs/admin-console/src/common/collections/services/default-vnext-collection.service.spec.ts b/libs/admin-console/src/common/collections/services/default-vnext-collection.service.spec.ts index 07330bad00d..e349f692de6 100644 --- a/libs/admin-console/src/common/collections/services/default-vnext-collection.service.spec.ts +++ b/libs/admin-console/src/common/collections/services/default-vnext-collection.service.spec.ts @@ -106,12 +106,10 @@ describe("DefaultvNextCollectionService", () => { expect(encryptService.decryptString).toHaveBeenCalledWith( expect.objectContaining(new EncString(collection1.name)), orgKey1, - expect.any(String), ); expect(encryptService.decryptString).toHaveBeenCalledWith( expect.objectContaining(new EncString(collection2.name)), orgKey2, - expect.any(String), ); }); diff --git a/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.spec.ts b/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.spec.ts index c6e641af32d..bcf8c24ec4d 100644 --- a/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.spec.ts +++ b/libs/key-management/src/user-asymmetric-key-regeneration/services/default-user-asymmetric-key-regeneration.service.spec.ts @@ -58,7 +58,9 @@ function setupUserKeyValidation( cipher.notes = mockEnc("EncryptedString"); cipher.key = mockEnc("EncKey"); cipherService.getAll.mockResolvedValue([cipher]); - encryptService.decryptFileData.mockResolvedValue(makeStaticByteArray(64)); + encryptService.unwrapSymmetricKey.mockResolvedValue( + new SymmetricCryptoKey(makeStaticByteArray(64)), + ); (window as any).bitwardenContainerService = new ContainerService(keyService, encryptService); } @@ -279,7 +281,7 @@ describe("regenerateIfNeeded", () => { }; setupVerificationResponse(mockVerificationResponse, sdkService); setupUserKeyValidation(cipherService, keyService, encryptService); - encryptService.decryptFileData.mockRejectedValue(new Error("error")); + encryptService.unwrapSymmetricKey.mockRejectedValue(new Error("error")); await sut.regenerateIfNeeded(userId); @@ -328,7 +330,7 @@ describe("regenerateIfNeeded", () => { }; setupVerificationResponse(mockVerificationResponse, sdkService); setupUserKeyValidation(cipherService, keyService, encryptService); - encryptService.decryptFileData.mockRejectedValue(new Error("error")); + encryptService.unwrapSymmetricKey.mockRejectedValue(new Error("error")); await sut.regenerateIfNeeded(userId);