bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-06 19:53:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'km/new-mp-service-api' of github.com:bitwarden/clients into km/new-mp-service-api

Browse Source
This commit is contained in:
Bernd Schoolmann
2025-07-22 13:02:08 +02:00
parent 37bdf652c3 6ac261b647
commit d386c0f66a
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts
View File

@@ -22,7 +22,7 @@ export abstract class MasterPasswordServiceAbstraction {
abstract forceSetPasswordReason$: (userId: UserId) => Observable<ForceSetPasswordReason>;
/**
* An observable that emits the master key for the user.
* @deprecated Interacting with the master-key directly is deprecated. Please use {@link makeMasterPasswordUnlockData} and {@link makeMasterPasswordAuthenticationData}, {@link unwrapUserKeyFromMasterPasswordUnlockData} instead.
* @deprecated Interacting with the master-key directly is deprecated. Please use {@link makeMasterPasswordUnlockData}, {@link makeMasterPasswordAuthenticationData} or {@link unwrapUserKeyFromMasterPasswordUnlockData} instead.
* @param userId The user ID.
* @throws If the user ID is missing.
*/
@@ -99,7 +99,7 @@ export abstract class InternalMasterPasswordServiceAbstraction extends MasterPas
abstract setMasterKey: (masterKey: MasterKey, userId: UserId) => Promise<void>;
/**
* Clear the master key for the user.
* @deprecated
* @deprecated Interacting with the master-key directly is deprecated.
* @param userId The user ID.
* @throws If the user ID is missing.
*/

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

@@ -245,8 +245,8 @@ export class MasterPasswordService implements InternalMasterPasswordServiceAbstr
) as MasterPasswordAuthenticationHash;
return {
kdf,
salt,
kdf,
masterPasswordAuthenticationHash,
} as MasterPasswordAuthenticationData;
}

4
libs/common/src/key-management/master-password/types/master-password.types.ts
View File

@@ -16,7 +16,7 @@ export type MasterPasswordSalt = Opaque<string, "MasterPasswordSalt">;
export type MasterKeyWrappedUserKey = Opaque<EncString, "MasterPasswordSalt">;
/**
* The data required to unlock the master password.
* The data required to unlock with the master password.
*/
export type MasterPasswordUnlockData = {
salt: MasterPasswordSalt;
@@ -25,7 +25,7 @@ export type MasterPasswordUnlockData = {
};
/**
* The data required to unlock the master password.
* The data required to authenticate with the master password.
*/
export type MasterPasswordAuthenticationData = {
salt: MasterPasswordSalt;