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

Remove legacy key support form tools code (#15349)

Browse Source
This commit is contained in:
Bernd Schoolmann
2025-07-07 13:27:50 +02:00
committed by GitHub
parent c7fc9b88fc
commit 03a7530f8b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/importer/src/importers/bitwarden/bitwarden-json-importer.ts
View File

@@ -71,7 +71,7 @@ export class BitwardenJsonImporter extends BaseImporter implements Importer {
this.organizationId,
);
if (keyForDecryption == null) {
keyForDecryption = await this.keyService.getUserKeyWithLegacySupport();
keyForDecryption = await this.keyService.getUserKey();
}
const encKeyValidation = new EncString(results.encKeyValidation_DO_NOT_EDIT);
const encKeyValidationDecrypt = await this.encryptService.decryptString(

2
libs/importer/src/services/import.service.ts
View File

@@ -365,7 +365,7 @@ export class ImportService implements ImportServiceAbstraction {
const c = await this.cipherService.encrypt(importResult.ciphers[i], activeUserId);
request.ciphers.push(new CipherRequest(c));
}
const userKey = await this.keyService.getUserKeyWithLegacySupport(activeUserId);
const userKey = await this.keyService.getUserKey(activeUserId);
if (importResult.folders != null) {
for (let i = 0; i < importResult.folders.length; i++) {
const f = await this.folderService.encrypt(importResult.folders[i], userKey);

2
libs/tools/export/vault-export/vault-export-core/src/services/individual-vault-export.service.ts
View File

@@ -225,7 +225,7 @@ export class IndividualVaultExportService
await Promise.all(promises);
const userKey = await this.keyService.getUserKeyWithLegacySupport(activeUserId);
const userKey = await this.keyService.getUserKey(activeUserId);
const encKeyValidation = await this.encryptService.encryptString(Utils.newGuid(), userKey);
const jsonDoc: BitwardenEncryptedIndividualJsonExport = {