From c53681e1fe4aea39320caf2b5e5232ce414e1f08 Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Fri, 18 Jul 2025 00:04:21 +0200
Subject: [PATCH] Fix abstract class types

---
 .../master-password.service.abstraction.ts       | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

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 a5783c74f08..ec0bf83c4bb 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
@@ -8,8 +8,8 @@ import { UserId } from "../../../types/guid";
 import { MasterKey, UserKey } from "../../../types/key";
 import { EncString } from "../../crypto/models/enc-string";
 import {
-  MasterKeyWrappedUserKey,
   MasterPasswordAuthenticationData,
+  MasterPasswordSalt,
   MasterPasswordUnlockData,
 } from "../types/master-password.types";
 
@@ -62,7 +62,7 @@ export abstract class MasterPasswordServiceAbstraction {
   abstract makeMasterPasswordAuthenticationData: (
     password: string,
     kdf: KdfConfig,
-    salt: string,
+    salt: MasterPasswordSalt,
     userId: UserId,
   ) => Promise<MasterPasswordAuthenticationData>;
 
@@ -73,20 +73,10 @@ export abstract class MasterPasswordServiceAbstraction {
   abstract makeMasterPasswordUnlockData: (
     password: string,
     kdf: KdfConfig,
-    salt: string,
+    salt: MasterPasswordSalt,
     userKey: UserKey,
   ) => Promise<MasterPasswordUnlockData>;
 
-  /**
-   * Wraps a user-key with a password provided KDF settings. The same KDF settings and salt must be provided to unwrap the user-key, otherwise it will fail to decrypt.
-   */
-  abstract makeMasterKeyWrappedUserKey: (
-    password: string,
-    kdf: KdfConfig,
-    salt: string,
-    userKey: UserKey,
-  ) => Promise<MasterKeyWrappedUserKey>;
-
   /**
    * Unwraps a user-key that was wrapped with a password provided KDF settings. The same KDF settings and salt must be provided to unwrap the user-key, otherwise it will fail to decrypt.
    * @throws If the encryption type is not supported.