fixed merge conflict

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

@@ -1,6 +1,5 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { DialogRef } from "@angular/cdk/dialog";
 import { Directive, OnInit } from "@angular/core";
 import { FormBuilder, Validators } from "@angular/forms";
 import { firstValueFrom } from "rxjs";
@@ -9,6 +8,7 @@ import { PinServiceAbstraction } from "@bitwarden/auth/common";
 import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
 import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
 import { Utils } from "@bitwarden/common/platform/misc/utils";
+import { DialogRef } from "@bitwarden/components";
 import { KeyService } from "@bitwarden/key-management";
 
 @Directive()
@@ -16,7 +16,7 @@ export class SetPinComponent implements OnInit {
   showMasterPasswordOnClientRestartOption = true;
 
   setPinForm = this.formBuilder.group({
-    pin: ["", [Validators.required]],
+    pin: ["", [Validators.required, Validators.minLength(4)]],
     requireMasterPasswordOnClientRestart: true,
   });
 
@@ -37,24 +37,26 @@ export class SetPinComponent implements OnInit {
   }
 
   submit = async () => {
-    const pin = this.setPinForm.get("pin").value;
+    const pinFormControl = this.setPinForm.controls.pin;
     const requireMasterPasswordOnClientRestart = this.setPinForm.get(
       "requireMasterPasswordOnClientRestart",
     ).value;
 
-    if (Utils.isNullOrWhitespace(pin)) {
-      this.dialogRef.close(false);
+    if (Utils.isNullOrWhitespace(pinFormControl.value) || pinFormControl.invalid) {
       return;
     }
 
     const userId = (await firstValueFrom(this.accountService.activeAccount$))?.id;
     const userKey = await this.keyService.getUserKey();
 
-    const userKeyEncryptedPin = await this.pinService.createUserKeyEncryptedPin(pin, userKey);
+    const userKeyEncryptedPin = await this.pinService.createUserKeyEncryptedPin(
+      pinFormControl.value,
+      userKey,
+    );
     await this.pinService.setUserKeyEncryptedPin(userKeyEncryptedPin, userId);
 
     const pinKeyEncryptedUserKey = await this.pinService.createPinKeyEncryptedUserKey(
-      pin,
+      pinFormControl.value,
       userKey,
       userId,
     );

libs/angular/src/auth/components/sso.component.spec.ts

@@ -17,10 +17,10 @@ import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/
 import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
+import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { FakeMasterPasswordService } from "@bitwarden/common/key-management/master-password/services/fake-master-password.service";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";

libs/angular/src/auth/components/sso.component.ts

@@ -18,9 +18,9 @@ import { SsoLoginServiceAbstraction } from "@bitwarden/common/auth/abstractions/
 import { AuthResult } from "@bitwarden/common/auth/models/domain/auth-result";
 import { ForceSetPasswordReason } from "@bitwarden/common/auth/models/domain/force-set-password-reason";
 import { SsoPreValidateResponse } from "@bitwarden/common/auth/models/response/sso-pre-validate.response";
+import { CryptoFunctionService } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { InternalMasterPasswordServiceAbstraction } from "@bitwarden/common/key-management/master-password/abstractions/master-password.service.abstraction";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { CryptoFunctionService } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import { EnvironmentService } from "@bitwarden/common/platform/abstractions/environment.service";
 import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
 import { LogService } from "@bitwarden/common/platform/abstractions/log.service";

libs/angular/src/auth/validators/inputs-field-match.validator.ts

@@ -1,167 +0,0 @@
-import { AbstractControl, UntypedFormGroup, ValidationErrors, ValidatorFn } from "@angular/forms";
-
-import { FormGroupControls } from "../../platform/abstractions/form-validation-errors.service";
-
-export class InputsFieldMatch {
-  /**
-   *  Check to ensure two fields do not have the same value
-   *
-   * @deprecated Use compareInputs() instead
-   */
-  static validateInputsDoesntMatch(matchTo: string, errorMessage: string): ValidatorFn {
-    return (control: AbstractControl) => {
-      if (control.parent && control.parent.controls) {
-        return control?.value === (control?.parent?.controls as FormGroupControls)[matchTo].value
-          ? {
-              inputsMatchError: {
-                message: errorMessage,
-              },
-            }
-          : null;
-      }
-
-      return null;
-    };
-  }
-
-  //check to ensure two fields have the same value
-  static validateInputsMatch(matchTo: string, errorMessage: string): ValidatorFn {
-    return (control: AbstractControl) => {
-      if (control.parent && control.parent.controls) {
-        return control?.value === (control?.parent?.controls as FormGroupControls)[matchTo].value
-          ? null
-          : {
-              inputsDoesntMatchError: {
-                message: errorMessage,
-              },
-            };
-      }
-
-      return null;
-    };
-  }
-
-  /**
-   * Checks the formGroup if two fields have the same value and validation is controlled from either field
-   *
-   * @deprecated
-   * Use compareInputs() instead.
-   *
-   * For more info on deprecation
-   * - Do not use untyped `options` object in formBuilder.group() {@link https://angular.dev/api/forms/UntypedFormBuilder}
-   * - Use formBuilder.group() overload with AbstractControlOptions type instead {@link https://angular.dev/api/forms/AbstractControlOptions}
-   *
-   * Remove this method after deprecated instances are replaced
-   */
-  static validateFormInputsMatch(field: string, fieldMatchTo: string, errorMessage: string) {
-    return (formGroup: UntypedFormGroup) => {
-      const fieldCtrl = formGroup.controls[field];
-      const fieldMatchToCtrl = formGroup.controls[fieldMatchTo];
-
-      if (fieldCtrl.value !== fieldMatchToCtrl.value) {
-        fieldMatchToCtrl.setErrors({
-          inputsDoesntMatchError: {
-            message: errorMessage,
-          },
-        });
-      } else {
-        fieldMatchToCtrl.setErrors(null);
-      }
-    };
-  }
-
-  /**
-   * Checks whether two form controls do or do not have the same input value (except for empty string values).
-   *
-   * - Validation is controlled from either form control.
-   * - The error message is displayed under controlB by default, but can be set to controlA.
-   *
-   * @param validationGoal Whether you want to verify that the form control input values match or do not match
-   * @param controlNameA The name of the first form control to compare.
-   * @param controlNameB The name of the second form control to compare.
-   * @param errorMessage The error message to display if there is an error. This will probably
-   *                     be an i18n translated string.
-   * @param showErrorOn The control under which you want to display the error (default is controlB).
-   */
-  static compareInputs(
-    validationGoal: "match" | "doNotMatch",
-    controlNameA: string,
-    controlNameB: string,
-    errorMessage: string,
-    showErrorOn: "controlA" | "controlB" = "controlB",
-  ): ValidatorFn {
-    return (control: AbstractControl): ValidationErrors | null => {
-      const controlA = control.get(controlNameA);
-      const controlB = control.get(controlNameB);
-
-      if (!controlA || !controlB) {
-        return null;
-      }
-
-      const controlThatShowsError = showErrorOn === "controlA" ? controlA : controlB;
-
-      // Don't compare empty strings
-      if (controlA.value === "" && controlB.value === "") {
-        return pass();
-      }
-
-      const controlValuesMatch = controlA.value === controlB.value;
-
-      if (validationGoal === "match") {
-        if (controlValuesMatch) {
-          return pass();
-        } else {
-          return fail();
-        }
-      }
-
-      if (validationGoal === "doNotMatch") {
-        if (!controlValuesMatch) {
-          return pass();
-        } else {
-          return fail();
-        }
-      }
-
-      return null; // default return
-
-      function fail() {
-        controlThatShowsError.setErrors({
-          // Preserve any pre-existing errors
-          ...controlThatShowsError.errors,
-          // Add new inputMatchError
-          inputMatchError: {
-            message: errorMessage,
-          },
-        });
-
-        return {
-          inputMatchError: {
-            message: errorMessage,
-          },
-        };
-      }
-
-      function pass(): null {
-        // Get the current errors object
-        const errorsObj = controlThatShowsError?.errors;
-
-        if (errorsObj != null) {
-          // Remove any inputMatchError if it exists, since that is the sole error we are targeting with this validator
-          if (errorsObj?.inputMatchError) {
-            delete errorsObj.inputMatchError;
-          }
-
-          // Check if the errorsObj is now empty
-          const isEmptyObj = Object.keys(errorsObj).length === 0;
-
-          // If the errorsObj is empty, set errors to null, otherwise set the errors to an object of pre-existing errors (other than inputMatchError)
-          controlThatShowsError.setErrors(isEmptyObj ? null : errorsObj);
-        }
-
-        // Return null for this validator
-        return null;
-      }
-    };
-  }
-}

libs/angular/src/billing/components/add-account-credit-dialog/add-account-credit-dialog.component.ts

@@ -1,6 +1,5 @@
 // FIXME: Update this file to be type safe and remove this and next line
 // @ts-strict-ignore
-import { DIALOG_DATA, DialogConfig, DialogRef } from "@angular/cdk/dialog";
 import { Component, ElementRef, Inject, OnInit, ViewChild } from "@angular/core";
 import { FormControl, FormGroup, Validators } from "@angular/forms";
 import { firstValueFrom, map } from "rxjs";
@@ -16,7 +15,7 @@ import { BitPayInvoiceRequest } from "@bitwarden/common/billing/models/request/b
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
 import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
 import { UserId } from "@bitwarden/common/types/guid";
-import { DialogService } from "@bitwarden/components";
+import { DIALOG_DATA, DialogConfig, DialogRef, DialogService } from "@bitwarden/components";
 
 export type AddAccountCreditDialogParams = {
   organizationId?: string;

libs/angular/src/billing/components/invoices/invoices.component.html

@@ -35,7 +35,7 @@
           {{ "open" | i18n | titlecase }}
         </span>
         <span *ngIf="expandedInvoiceStatus === 'unpaid'">
-          <i class="bwi bwi-exclamation-circle tw-text-muted" aria-hidden="true"></i>
+          <i class="bwi bwi-error tw-text-muted" aria-hidden="true"></i>
           {{ "unpaid" | i18n | titlecase }}
         </span>
         <span *ngIf="expandedInvoiceStatus === 'paid'">

libs/angular/src/platform/abstractions/view-cache.service.ts

@@ -9,7 +9,7 @@ type Deserializer<T> = {
    * @param jsonValue The JSON object representation of your state.
    * @returns The fully typed version of your state.
    */
-  readonly deserializer?: (jsonValue: Jsonify<T>) => T;
+  readonly deserializer?: (jsonValue: Jsonify<T>) => T | null;
 };
 
 type BaseCacheOptions<T> = {

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

@@ -4,48 +4,48 @@ import { ErrorHandler, LOCALE_ID, NgModule } from "@angular/core";
 import { Subject } from "rxjs";
 
 import {
-  OrganizationUserApiService,
-  DefaultOrganizationUserApiService,
   CollectionService,
   DefaultCollectionService,
+  DefaultOrganizationUserApiService,
+  OrganizationUserApiService,
 } from "@bitwarden/admin-console/common";
 import {
-  SetPasswordJitService,
-  DefaultSetPasswordJitService,
-  RegistrationFinishService as RegistrationFinishServiceAbstraction,
-  DefaultRegistrationFinishService,
   AnonLayoutWrapperDataService,
   DefaultAnonLayoutWrapperDataService,
-  LoginComponentService,
+  DefaultLoginApprovalComponentService,
   DefaultLoginComponentService,
-  LoginDecryptionOptionsService,
   DefaultLoginDecryptionOptionsService,
-  TwoFactorAuthComponentService,
+  DefaultRegistrationFinishService,
+  DefaultSetPasswordJitService,
   DefaultTwoFactorAuthComponentService,
   DefaultTwoFactorAuthEmailComponentService,
-  TwoFactorAuthEmailComponentService,
   DefaultTwoFactorAuthWebAuthnComponentService,
+  LoginComponentService,
+  LoginDecryptionOptionsService,
+  RegistrationFinishService as RegistrationFinishServiceAbstraction,
+  SetPasswordJitService,
+  TwoFactorAuthComponentService,
+  TwoFactorAuthEmailComponentService,
   TwoFactorAuthWebAuthnComponentService,
-  DefaultLoginApprovalComponentService,
 } from "@bitwarden/auth/angular";
 import {
-  AuthRequestServiceAbstraction,
-  AuthRequestService,
-  PinServiceAbstraction,
-  PinService,
-  LoginStrategyServiceAbstraction,
-  LoginStrategyService,
-  LoginEmailServiceAbstraction,
-  LoginEmailService,
-  InternalUserDecryptionOptionsServiceAbstraction,
-  UserDecryptionOptionsService,
-  UserDecryptionOptionsServiceAbstraction,
-  LogoutReason,
   AuthRequestApiService,
+  AuthRequestService,
+  AuthRequestServiceAbstraction,
   DefaultAuthRequestApiService,
   DefaultLoginSuccessHandlerService,
-  LoginSuccessHandlerService,
+  InternalUserDecryptionOptionsServiceAbstraction,
   LoginApprovalComponentServiceAbstraction,
+  LoginEmailService,
+  LoginEmailServiceAbstraction,
+  LoginStrategyService,
+  LoginStrategyServiceAbstraction,
+  LoginSuccessHandlerService,
+  LogoutReason,
+  PinService,
+  PinServiceAbstraction,
+  UserDecryptionOptionsService,
+  UserDecryptionOptionsServiceAbstraction,
 } from "@bitwarden/auth/common";
 import { ApiService as ApiServiceAbstraction } from "@bitwarden/common/abstractions/api.service";
 import { AuditService as AuditServiceAbstraction } from "@bitwarden/common/abstractions/audit.service";
@@ -118,16 +118,16 @@ import { WebAuthnLoginApiService } from "@bitwarden/common/auth/services/webauth
 import { WebAuthnLoginPrfKeyService } from "@bitwarden/common/auth/services/webauthn-login/webauthn-login-prf-key.service";
 import { WebAuthnLoginService } from "@bitwarden/common/auth/services/webauthn-login/webauthn-login.service";
 import {
-  AutofillSettingsServiceAbstraction,
   AutofillSettingsService,
+  AutofillSettingsServiceAbstraction,
 } from "@bitwarden/common/autofill/services/autofill-settings.service";
 import {
-  BadgeSettingsServiceAbstraction,
   BadgeSettingsService,
+  BadgeSettingsServiceAbstraction,
 } from "@bitwarden/common/autofill/services/badge-settings.service";
 import {
-  DomainSettingsService,
   DefaultDomainSettingsService,
+  DomainSettingsService,
 } from "@bitwarden/common/autofill/services/domain-settings.service";
 import {
   BillingApiServiceAbstraction,
@@ -144,9 +144,11 @@ import { OrganizationBillingApiService } from "@bitwarden/common/billing/service
 import { OrganizationBillingService } from "@bitwarden/common/billing/services/organization-billing.service";
 import { TaxService } from "@bitwarden/common/billing/services/tax.service";
 import { BulkEncryptService } from "@bitwarden/common/key-management/crypto/abstractions/bulk-encrypt.service";
+import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/key-management/crypto/abstractions/crypto-function.service";
 import { EncryptService } from "@bitwarden/common/key-management/crypto/abstractions/encrypt.service";
 import { BulkEncryptServiceImplementation } from "@bitwarden/common/key-management/crypto/services/bulk-encrypt.service.implementation";
 import { MultithreadEncryptServiceImplementation } from "@bitwarden/common/key-management/crypto/services/multithread-encrypt.service.implementation";
+import { WebCryptoFunctionService } from "@bitwarden/common/key-management/crypto/services/web-crypto-function.service";
 import { DeviceTrustServiceAbstraction } from "@bitwarden/common/key-management/device-trust/abstractions/device-trust.service.abstraction";
 import { DeviceTrustService } from "@bitwarden/common/key-management/device-trust/services/device-trust.service.implementation";
 import { KeyConnectorService as KeyConnectorServiceAbstraction } from "@bitwarden/common/key-management/key-connector/abstractions/key-connector.service";
@@ -166,7 +168,6 @@ import { AppIdService as AppIdServiceAbstraction } from "@bitwarden/common/platf
 import { BroadcasterService } from "@bitwarden/common/platform/abstractions/broadcaster.service";
 import { ConfigApiServiceAbstraction } from "@bitwarden/common/platform/abstractions/config/config-api.service.abstraction";
 import { ConfigService } from "@bitwarden/common/platform/abstractions/config/config.service";
-import { CryptoFunctionService as CryptoFunctionServiceAbstraction } from "@bitwarden/common/platform/abstractions/crypto-function.service";
 import {
   EnvironmentService,
   RegionConfig,
@@ -200,8 +201,8 @@ import {
   WebPushNotificationsApiService,
 } from "@bitwarden/common/platform/notifications/internal";
 import {
-  TaskSchedulerService,
   DefaultTaskSchedulerService,
+  TaskSchedulerService,
 } from "@bitwarden/common/platform/scheduling";
 import { AppIdService } from "@bitwarden/common/platform/services/app-id.service";
 import { ConfigApiService } from "@bitwarden/common/platform/services/config/config-api.service";
@@ -219,13 +220,12 @@ import { StateService } from "@bitwarden/common/platform/services/state.service"
 import { StorageServiceProvider } from "@bitwarden/common/platform/services/storage-service.provider";
 import { UserAutoUnlockKeyService } from "@bitwarden/common/platform/services/user-auto-unlock-key.service";
 import { ValidationService } from "@bitwarden/common/platform/services/validation.service";
-import { WebCryptoFunctionService } from "@bitwarden/common/platform/services/web-crypto-function.service";
 import {
   ActiveUserStateProvider,
+  DerivedStateProvider,
   GlobalStateProvider,
   SingleUserStateProvider,
   StateProvider,
-  DerivedStateProvider,
 } from "@bitwarden/common/platform/state";
 /* eslint-disable import/no-restricted-paths -- We need the implementations to inject, but generally these should not be accessed */
 import { DefaultActiveUserStateProvider } from "@bitwarden/common/platform/state/implementations/default-active-user-state.provider";
@@ -282,6 +282,7 @@ import { FolderApiService } from "@bitwarden/common/vault/services/folder/folder
 import { FolderService } from "@bitwarden/common/vault/services/folder/folder.service";
 import { TotpService } from "@bitwarden/common/vault/services/totp.service";
 import { VaultSettingsService } from "@bitwarden/common/vault/services/vault-settings/vault-settings.service";
+import { DefaultTaskService, TaskService } from "@bitwarden/common/vault/tasks";
 import { ToastService } from "@bitwarden/components";
 import {
   GeneratorHistoryService,
@@ -294,34 +295,32 @@ import {
   UsernameGenerationServiceAbstraction,
 } from "@bitwarden/generator-legacy";
 import {
-  KeyService,
-  DefaultKeyService,
+  BiometricsService,
   BiometricStateService,
   DefaultBiometricStateService,
-  BiometricsService,
   DefaultKdfConfigService,
-  KdfConfigService,
-  UserAsymmetricKeysRegenerationService,
-  DefaultUserAsymmetricKeysRegenerationService,
-  UserAsymmetricKeysRegenerationApiService,
+  DefaultKeyService,
   DefaultUserAsymmetricKeysRegenerationApiService,
+  DefaultUserAsymmetricKeysRegenerationService,
+  KdfConfigService,
+  KeyService,
+  UserAsymmetricKeysRegenerationApiService,
+  UserAsymmetricKeysRegenerationService,
 } from "@bitwarden/key-management";
 import { SafeInjectionToken } from "@bitwarden/ui-common";
 import {
-  DefaultTaskService,
   DefaultEndUserNotificationService,
   EndUserNotificationService,
   NewDeviceVerificationNoticeService,
   PasswordRepromptService,
-  TaskService,
 } from "@bitwarden/vault";
 import {
-  VaultExportService,
-  VaultExportServiceAbstraction,
-  OrganizationVaultExportService,
-  OrganizationVaultExportServiceAbstraction,
   IndividualVaultExportService,
   IndividualVaultExportServiceAbstraction,
+  OrganizationVaultExportService,
+  OrganizationVaultExportServiceAbstraction,
+  VaultExportService,
+  VaultExportServiceAbstraction,
 } from "@bitwarden/vault-export-core";
 
 import { DeviceTrustToastService as DeviceTrustToastServiceAbstraction } from "../auth/services/device-trust-toast.service.abstraction";
@@ -336,24 +335,24 @@ import { AbstractThemingService } from "../platform/services/theming/theming.ser
 import { safeProvider, SafeProvider } from "../platform/utils/safe-provider";
 
 import {
+  CLIENT_TYPE,
+  DEFAULT_VAULT_TIMEOUT,
+  ENV_ADDITIONAL_REGIONS,
+  INTRAPROCESS_MESSAGING_SUBJECT,
   LOCALES_DIRECTORY,
   LOCKED_CALLBACK,
-  LOGOUT_CALLBACK,
   LOG_MAC_FAILURES,
+  LOGOUT_CALLBACK,
   MEMORY_STORAGE,
   OBSERVABLE_DISK_STORAGE,
   OBSERVABLE_MEMORY_STORAGE,
+  REFRESH_ACCESS_TOKEN_ERROR_CALLBACK,
   SECURE_STORAGE,
   STATE_FACTORY,
   SUPPORTS_SECURE_STORAGE,
   SYSTEM_LANGUAGE,
   SYSTEM_THEME_OBSERVABLE,
   WINDOW,
-  DEFAULT_VAULT_TIMEOUT,
-  INTRAPROCESS_MESSAGING_SUBJECT,
-  CLIENT_TYPE,
-  REFRESH_ACCESS_TOKEN_ERROR_CALLBACK,
-  ENV_ADDITIONAL_REGIONS,
 } from "./injection-tokens";
 import { ModalService } from "./modal.service";
 
@@ -508,7 +507,7 @@ const safeProviders: SafeProvider[] = [
       configService: ConfigService,
       stateProvider: StateProvider,
       accountService: AccountServiceAbstraction,
-      sdkService: SdkService,
+      logService: LogService,
       cipherEncryptionService: CipherEncryptionService,
     ) =>
       new CipherService(
@@ -525,7 +524,7 @@ const safeProviders: SafeProvider[] = [
         configService,
         stateProvider,
         accountService,
-        sdkService,
+        logService,
         cipherEncryptionService,
       ),
     deps: [
@@ -542,7 +541,7 @@ const safeProviders: SafeProvider[] = [
       ConfigService,
       StateProvider,
       AccountServiceAbstraction,
-      SdkService,
+      LogService,
       CipherEncryptionService,
     ],
   }),
@@ -1181,9 +1180,7 @@ const safeProviders: SafeProvider[] = [
       KdfConfigService,
       KeyGenerationServiceAbstraction,
       LogService,
-      MasterPasswordServiceAbstraction,
       StateProvider,
-      StateServiceAbstraction,
     ],
   }),
   safeProvider({
@@ -1483,7 +1480,15 @@ const safeProviders: SafeProvider[] = [
   safeProvider({
     provide: TaskService,
     useClass: DefaultTaskService,
-    deps: [StateProvider, ApiServiceAbstraction, OrganizationServiceAbstraction, ConfigService],
+    deps: [
+      StateProvider,
+      ApiServiceAbstraction,
+      OrganizationServiceAbstraction,
+      ConfigService,
+      AuthServiceAbstraction,
+      NotificationsService,
+      MessageListener,
+    ],
   }),
   safeProvider({
     provide: EndUserNotificationService,

libs/angular/src/vault/components/view.component.ts

@@ -59,6 +59,7 @@ export class ViewComponent implements OnDestroy, OnInit {
   @Output() onRestoredCipher = new EventEmitter<CipherView>();
 
   canDeleteCipher$: Observable<boolean>;
+  canRestoreCipher$: Observable<boolean>;
   cipher: CipherView;
   showPassword: boolean;
   showPasswordCount: boolean;
@@ -159,6 +160,7 @@ export class ViewComponent implements OnDestroy, OnInit {
     this.canDeleteCipher$ = this.cipherAuthorizationService.canDeleteCipher$(this.cipher, [
       this.collectionId as CollectionId,
     ]);
+    this.canRestoreCipher$ = this.cipherAuthorizationService.canRestoreCipher$(this.cipher);
 
     if (this.cipher.folderId) {
       this.folder = await (
@@ -203,12 +205,7 @@ export class ViewComponent implements OnDestroy, OnInit {
   }
 
   async edit() {
-    if (await this.promptPassword()) {
-      this.onEditCipher.emit(this.cipher);
-      return true;
-    }
-
-    return false;
+    this.onEditCipher.emit(this.cipher);
   }
 
   async clone() {