From 9de08adf55166682ae23e0099d8dc69419383809 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 22 Jul 2025 12:48:51 +0200 Subject: [PATCH 1/5] Update libs/common/src/key-management/master-password/types/master-password.types.ts Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> --- .../master-password/types/master-password.types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common/src/key-management/master-password/types/master-password.types.ts b/libs/common/src/key-management/master-password/types/master-password.types.ts index 46d4b61c14e..46a8dc6e0b4 100644 --- a/libs/common/src/key-management/master-password/types/master-password.types.ts +++ b/libs/common/src/key-management/master-password/types/master-password.types.ts @@ -22,7 +22,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; From be697ada34919c00d3915de118be2e9b330283c9 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 22 Jul 2025 12:49:37 +0200 Subject: [PATCH 2/5] Update libs/common/src/key-management/master-password/services/master-password.service.ts Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> --- .../master-password/services/master-password.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common/src/key-management/master-password/services/master-password.service.ts b/libs/common/src/key-management/master-password/services/master-password.service.ts index f237082d628..8c5c1077b55 100644 --- a/libs/common/src/key-management/master-password/services/master-password.service.ts +++ b/libs/common/src/key-management/master-password/services/master-password.service.ts @@ -245,8 +245,8 @@ export class MasterPasswordService implements InternalMasterPasswordServiceAbstr ) as MasterPasswordAuthenticationHash; return { - kdf, salt, + kdf, masterPasswordAuthenticationHash, } as MasterPasswordAuthenticationData; } From 530c835a3dad2cd8c1f16ebce9cffd5a05a4fbde Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 22 Jul 2025 12:51:08 +0200 Subject: [PATCH 3/5] Update libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> --- .../abstractions/master-password.service.abstraction.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts b/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts index 8c7798cb773..cc1d998ad6c 100644 --- a/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts +++ b/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts @@ -99,7 +99,7 @@ export abstract class InternalMasterPasswordServiceAbstraction extends MasterPas abstract setMasterKey: (masterKey: MasterKey, userId: UserId) => Promise; /** * 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. */ From 915e5f11e823c8e0480172e104d5f4204bb76a6b Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 22 Jul 2025 12:54:26 +0200 Subject: [PATCH 4/5] Update libs/common/src/key-management/master-password/types/master-password.types.ts Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> --- .../master-password/types/master-password.types.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common/src/key-management/master-password/types/master-password.types.ts b/libs/common/src/key-management/master-password/types/master-password.types.ts index 46a8dc6e0b4..caf581668c6 100644 --- a/libs/common/src/key-management/master-password/types/master-password.types.ts +++ b/libs/common/src/key-management/master-password/types/master-password.types.ts @@ -13,7 +13,7 @@ export type MasterPasswordSalt = Opaque; export type MasterKeyWrappedUserKey = Opaque; /** - * The data required to unlock the master password. + * The data required to unlock with the master password. */ export type MasterPasswordUnlockData = { salt: MasterPasswordSalt; From 6ac261b6476e50fb622835d37ed487a0ec702b35 Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Tue, 22 Jul 2025 12:54:40 +0200 Subject: [PATCH 5/5] Update libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts Co-authored-by: Thomas Avery <43214426+Thomas-Avery@users.noreply.github.com> --- .../abstractions/master-password.service.abstraction.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts b/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts index cc1d998ad6c..53ee650ed79 100644 --- a/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts +++ b/libs/common/src/key-management/master-password/abstractions/master-password.service.abstraction.ts @@ -22,7 +22,7 @@ export abstract class MasterPasswordServiceAbstraction { abstract forceSetPasswordReason$: (userId: UserId) => Observable; /** * 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. */