Merge branch 'main' into auth/pm-26209/bugfix-desktop-error-on-auth-request-approval

libs/angular/src/auth/components/set-pin.component.ts

@@ -9,7 +9,6 @@ import { UserVerificationService } from "@bitwarden/common/auth/abstractions/use
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
 import { DialogRef } from "@bitwarden/components";
-import { KeyService } from "@bitwarden/key-management";
 
 @Directive()
 export class SetPinComponent implements OnInit {
@@ -22,7 +21,6 @@ export class SetPinComponent implements OnInit {
 
   constructor(
     private accountService: AccountService,
-    private keyService: KeyService,
     private dialogRef: DialogRef,
     private formBuilder: FormBuilder,
     private pinService: PinServiceAbstraction,
@@ -47,25 +45,11 @@ export class SetPinComponent implements OnInit {
     }
 
     const userId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
-    const userKey = await this.keyService.getUserKey();
-
-    const userKeyEncryptedPin = await this.pinService.createUserKeyEncryptedPin(
+    await this.pinService.setPin(
       pinFormControl.value,
-      userKey,
-    );
-    await this.pinService.setUserKeyEncryptedPin(userKeyEncryptedPin, userId);
-
-    const pinKeyEncryptedUserKey = await this.pinService.createPinKeyEncryptedUserKey(
-      pinFormControl.value,
-      userKey,
+      requireMasterPasswordOnClientRestart ? "EPHEMERAL" : "PERSISTENT",
       userId,
     );
-    await this.pinService.storePinKeyEncryptedUserKey(
-      pinKeyEncryptedUserKey,
-      requireMasterPasswordOnClientRestart,
-      userId,
-    );
-
     this.dialogRef.close(true);
   };
 }

libs/angular/src/services/jslib-services.module.ts

@@ -182,6 +182,8 @@ import {
 } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { DefaultMasterPasswordUnlockService } from "@bitwarden/common/key-management/master-password/services/default-master-password-unlock.service";
 import { MasterPasswordService } from "@bitwarden/common/key-management/master-password/services/master-password.service";
+import { PinStateServiceAbstraction } from "@bitwarden/common/key-management/pin/pin-state.service.abstraction";
+import { PinStateService } from "@bitwarden/common/key-management/pin/pin-state.service.implementation";
 import { PinServiceAbstraction } from "@bitwarden/common/key-management/pin/pin.service.abstraction";
 import { PinService } from "@bitwarden/common/key-management/pin/pin.service.implementation";
 import { SecurityStateService } from "@bitwarden/common/key-management/security-state/abstractions/security-state.service";
@@ -542,7 +544,7 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: DomainSettingsService,
     useClass: DefaultDomainSettingsService,
-    deps: [StateProvider],
+    deps: [StateProvider, PolicyServiceAbstraction, AccountService],
   }),
   safeProvider({
     provide: CipherServiceAbstraction,
@@ -696,7 +698,6 @@ const safeProviders: SafeProvider[] = [
     provide: KeyService,
     useClass: DefaultKeyService,
     deps: [
-      PinServiceAbstraction,
       InternalMasterPasswordServiceAbstraction,
       KeyGenerationService,
       CryptoFunctionServiceAbstraction,
@@ -856,7 +857,7 @@ const safeProviders: SafeProvider[] = [
     useClass: DefaultVaultTimeoutSettingsService,
     deps: [
       AccountServiceAbstraction,
-      PinServiceAbstraction,
+      PinStateServiceAbstraction,
       UserDecryptionOptionsServiceAbstraction,
       KeyService,
       TokenServiceAbstraction,
@@ -1072,9 +1073,7 @@ const safeProviders: SafeProvider[] = [
     useClass: MasterPasswordService,
     deps: [
       StateProvider,
-      StateServiceAbstraction,
       KeyGenerationService,
-      EncryptService,
       LogService,
       CryptoFunctionServiceAbstraction,
       AccountServiceAbstraction,
@@ -1295,19 +1294,26 @@ const safeProviders: SafeProvider[] = [
       ApiServiceAbstraction,
       StateProvider,
       AuthRequestApiServiceAbstraction,
+      AccountServiceAbstraction,
     ],
   }),
+  safeProvider({
+    provide: PinStateServiceAbstraction,
+    useClass: PinStateService,
+    deps: [StateProvider],
+  }),
   safeProvider({
     provide: PinServiceAbstraction,
     useClass: PinService,
     deps: [
       AccountServiceAbstraction,
-      CryptoFunctionServiceAbstraction,
       EncryptService,
       KdfConfigService,
       KeyGenerationService,
       LogService,
-      StateProvider,
+      KeyService,
+      SdkService,
+      PinStateServiceAbstraction,
     ],
   }),
   safeProvider({