bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-14 07:23:45 +00:00
Code Issues Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
Bernd Schoolmann
2025-07-22 13:41:38 +02:00
parent 031a689667
commit a8105af829
2 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/common/src/key-management/master-password/services/master-password.service.spec.ts
View File

@@ -5,13 +5,9 @@ import * as rxjs from "rxjs";
import { SdkLoadService } from "@bitwarden/common/platform/abstractions/sdk/sdk-load.service";
import { Utils } from "@bitwarden/common/platform/misc/utils";
// eslint-disable-next-line no-restricted-imports
import { KdfConfig, KdfConfigService, PBKDF2KdfConfig } from "@bitwarden/key-management";
import { KdfConfig, PBKDF2KdfConfig } from "@bitwarden/key-management";
import {
FakeAccountService,
makeSymmetricCryptoKey,
mockAccountServiceWith,
} from "../../../../spec";
import { makeSymmetricCryptoKey } from "../../../../spec";
import { ForceSetPasswordReason } from "../../../auth/models/domain/force-set-password-reason";
import { KeyGenerationService } from "../../../platform/abstractions/key-generation.service";
import { LogService } from "../../../platform/abstractions/log.service";
@@ -36,8 +32,6 @@ describe("MasterPasswordService", () => {
let encryptService: MockProxy<EncryptService>;
let logService: MockProxy<LogService>;
let cryptoFunctionService: MockProxy<CryptoFunctionService>;
let kdfConfigService: MockProxy<KdfConfigService>;
let accountService: FakeAccountService;
const userId = "user-id" as UserId;
const mockUserState = {
@@ -60,8 +54,6 @@ describe("MasterPasswordService", () => {
encryptService = mock<EncryptService>();
logService = mock<LogService>();
cryptoFunctionService = mock<CryptoFunctionService>();
kdfConfigService = mock<KdfConfigService>();
accountService = mockAccountServiceWith(userId);
stateProvider.getUser.mockReturnValue(mockUserState as any);
@@ -74,8 +66,6 @@ describe("MasterPasswordService", () => {
encryptService,
logService,
cryptoFunctionService,
kdfConfigService,
accountService,
);
encryptService.unwrapSymmetricKey.mockResolvedValue(makeSymmetricCryptoKey(64, 1));

2
libs/common/src/key-management/master-password/services/master-password.service.ts
View File

@@ -310,7 +310,7 @@ export class MasterPasswordService implements InternalMasterPasswordServiceAbstr
await SdkLoadService.Ready;
const userKey = new SymmetricCryptoKey(
PureCrypto.decrypt_user_key_with_master_password(
masterPasswordUnlockData.masterKeyWrappedUserKey!.encryptedString,
masterPasswordUnlockData.masterKeyWrappedUserKey.encryptedString,
password,
masterPasswordUnlockData.salt,
masterPasswordUnlockData.kdf.toSdkConfig(),