diff --git a/apps/cli/src/service-container/service-container.ts b/apps/cli/src/service-container/service-container.ts index 1cccbba65e3..7389d5a48f1 100644 --- a/apps/cli/src/service-container/service-container.ts +++ b/apps/cli/src/service-container/service-container.ts @@ -494,7 +494,6 @@ export class ServiceContainer { this.masterPasswordUnlockService = new DefaultMasterPasswordUnlockService( this.masterPasswordService, this.keyService, - this.kdfConfigService, ); this.appIdService = new AppIdService(this.storageService, this.logService); diff --git a/libs/angular/src/services/jslib-services.module.ts b/libs/angular/src/services/jslib-services.module.ts index fe19b8a9220..9361fc89d08 100644 --- a/libs/angular/src/services/jslib-services.module.ts +++ b/libs/angular/src/services/jslib-services.module.ts @@ -1105,7 +1105,7 @@ const safeProviders: SafeProvider[] = [ safeProvider({ provide: MasterPasswordUnlockService, useClass: DefaultMasterPasswordUnlockService, - deps: [InternalMasterPasswordServiceAbstraction, KeyService, KdfConfigService], + deps: [InternalMasterPasswordServiceAbstraction, KeyService], }), safeProvider({ provide: KeyConnectorServiceAbstraction, diff --git a/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.spec.ts b/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.spec.ts index 9c35a2a2006..6a6a9425e81 100644 --- a/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.spec.ts +++ b/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.spec.ts @@ -3,7 +3,7 @@ import { of } from "rxjs"; import { newGuid } from "@bitwarden/guid"; // eslint-disable-next-line no-restricted-imports -import { Argon2KdfConfig, KdfConfigService, KeyService } from "@bitwarden/key-management"; +import { Argon2KdfConfig, KeyService } from "@bitwarden/key-management"; import { UserId } from "@bitwarden/user-core"; import { HashPurpose } from "../../../platform/enums"; @@ -23,7 +23,6 @@ describe("DefaultMasterPasswordUnlockService", () => { let masterPasswordService: MockProxy; let keyService: MockProxy; - let kdfService: MockProxy; const mockMasterPassword = "testExample"; const mockUserId = newGuid() as UserId; @@ -42,9 +41,8 @@ describe("DefaultMasterPasswordUnlockService", () => { beforeEach(() => { masterPasswordService = mock(); keyService = mock(); - kdfService = mock(); - sut = new DefaultMasterPasswordUnlockService(masterPasswordService, keyService, kdfService); + sut = new DefaultMasterPasswordUnlockService(masterPasswordService, keyService); masterPasswordService.masterPasswordUnlockData$.mockReturnValue( of(mockMasterPasswordUnlockData), diff --git a/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.ts b/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.ts index 079f0505d03..87114000abf 100644 --- a/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.ts +++ b/libs/common/src/key-management/master-password/services/default-master-password-unlock.service.ts @@ -1,7 +1,7 @@ import { firstValueFrom } from "rxjs"; // eslint-disable-next-line no-restricted-imports -import { KdfConfigService, KeyService } from "@bitwarden/key-management"; +import { KeyService } from "@bitwarden/key-management"; import { UserId } from "@bitwarden/user-core"; import { HashPurpose } from "../../../platform/enums"; @@ -14,7 +14,6 @@ export class DefaultMasterPasswordUnlockService implements MasterPasswordUnlockS constructor( private readonly masterPasswordService: InternalMasterPasswordServiceAbstraction, private readonly keyService: KeyService, - private readonly kdfService: KdfConfigService, ) {} async unlockWithMasterPassword(masterPassword: string, userId: UserId): Promise { @@ -72,6 +71,5 @@ export class DefaultMasterPasswordUnlockService implements MasterPasswordUnlockS await this.masterPasswordService.setMasterKeyHash(localKeyHash, userId); await this.masterPasswordService.setMasterKey(masterKey, userId); - await this.kdfService.setKdfConfig(userId, masterPasswordUnlockData.kdf); } }