bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-10 13:23:34 +00:00
Code Issues Releases Wiki Activity

Remove legacy key support form platform code (#15351)

Browse Source
This commit is contained in:
Bernd Schoolmann
2025-08-01 20:06:22 +02:00
committed by GitHub
parent b7df5e9bdb
commit 0cc473fb0f
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/cli/src/commands/edit.command.ts
View File

@@ -170,7 +170,7 @@ export class EditCommand {
let folderView = await folder.decrypt(); let folderView = await folder.decrypt();
folderView = FolderExport.toView(req, folderView); folderView = FolderExport.toView(req, folderView);
const userKey = await this.keyService.getUserKeyWithLegacySupport(activeUserId); const userKey = await this.keyService.getUserKey(activeUserId);
const encFolder = await this.folderService.encrypt(folderView, userKey); const encFolder = await this.folderService.encrypt(folderView, userKey);
try { try {
const folder = await this.folderApiService.save(encFolder, activeUserId); const folder = await this.folderApiService.save(encFolder, activeUserId);

8
libs/common/src/key-management/crypto/models/enc-string.spec.ts
View File

@@ -83,7 +83,7 @@ describe("EncString", () => {
const keyService = mock<KeyService>(); const keyService = mock<KeyService>();
keyService.hasUserKey.mockResolvedValue(true); keyService.hasUserKey.mockResolvedValue(true);
keyService.getUserKeyWithLegacySupport.mockResolvedValue( keyService.getUserKey.mockResolvedValue(
new SymmetricCryptoKey(makeStaticByteArray(32)) as UserKey, new SymmetricCryptoKey(makeStaticByteArray(32)) as UserKey,
); );
@@ -282,7 +282,7 @@ describe("EncString", () => {
await encString.decrypt(null, key); await encString.decrypt(null, key);
expect(keyService.getUserKeyWithLegacySupport).not.toHaveBeenCalled(); expect(keyService.getUserKey).not.toHaveBeenCalled();
expect(encryptService.decryptString).toHaveBeenCalledWith(encString, key); expect(encryptService.decryptString).toHaveBeenCalledWith(encString, key);
}); });
@@ -300,11 +300,11 @@ describe("EncString", () => {
it("gets the user's decryption key if required", async () => { it("gets the user's decryption key if required", async () => {
const userKey = mock<UserKey>(); const userKey = mock<UserKey>();
keyService.getUserKeyWithLegacySupport.mockResolvedValue(userKey); keyService.getUserKey.mockResolvedValue(userKey);
await encString.decrypt(null, null); await encString.decrypt(null, null);
expect(keyService.getUserKeyWithLegacySupport).toHaveBeenCalledWith(); expect(keyService.getUserKey).toHaveBeenCalledWith();
expect(encryptService.decryptString).toHaveBeenCalledWith(encString, userKey); expect(encryptService.decryptString).toHaveBeenCalledWith(encString, userKey);
}); });
}); });

4
libs/common/src/key-management/crypto/models/enc-string.ts
View File

@@ -191,9 +191,7 @@ export class EncString implements Encrypted {
private async getKeyForDecryption(orgId: string) { private async getKeyForDecryption(orgId: string) {
const keyService = Utils.getContainerService().getKeyService(); const keyService = Utils.getContainerService().getKeyService();
return orgId != null return orgId != null ? await keyService.getOrgKey(orgId) : await keyService.getUserKey();
? await keyService.getOrgKey(orgId)
: await keyService.getUserKeyWithLegacySupport();
} }
} }