[PM-12047] Remove usage of ActiveUserState from cipher.service (#12814)

* Cipher service web changes

* Updated browser client to pass user id to cipher service observable changes

* Cli changes

* desktop changes

* Fixed test

* Libs changes

* Fixed merge conflicts

* Fixed merge conflicts

* removed duplicate reference fixed conflict

* Fixed test

* Fixed test

* Fixed test

* Fixed desturcturing issue on failed to decrypt ciphers cipher service

* Updated abstraction to use method syntax

* Fixed conflicts

* Fixed test on add edit v2

Passed active userId to delete function

* Used getUserId utility function

* made vault changes

* made suggestion changes

* made suggestion changes

* made suggestion changes

* Replace getUserId function calls with pipe operator syntax for better consistency

* fixed merge conflicts

* revert mistake made of usinf account activity during merge conflict fix

* fixed conflicts

* fixed tests

libs/common/src/vault/abstractions/cipher.service.ts

@@ -19,57 +19,70 @@ import { FieldView } from "../models/view/field.view";
 import { AddEditCipherInfo } from "../types/add-edit-cipher-info";
 
 export abstract class CipherService implements UserKeyRotationDataProvider<CipherWithIdRequest> {
-  cipherViews$: Observable<CipherView[]>;
-  ciphers$: Observable<Record<CipherId, CipherData>>;
-  localData$: Observable<Record<CipherId, LocalData>>;
+  abstract cipherViews$(userId: UserId): Observable<CipherView[]>;
+  abstract ciphers$(userId: UserId): Observable<Record<CipherId, CipherData>>;
+  abstract localData$(userId: UserId): Observable<Record<CipherId, LocalData>>;
   /**
    *  An observable monitoring the add/edit cipher info saved to memory.
    */
-  addEditCipherInfo$: Observable<AddEditCipherInfo>;
+  abstract addEditCipherInfo$(userId: UserId): Observable<AddEditCipherInfo>;
   /**
    * Observable that emits an array of cipherViews that failed to decrypt. Does not emit until decryption has completed.
    *
    * An empty array indicates that all ciphers were successfully decrypted.
    */
-  failedToDecryptCiphers$: Observable<CipherView[]>;
-  clearCache: (userId?: string) => Promise<void>;
-  encrypt: (
+  abstract failedToDecryptCiphers$(userId: UserId): Observable<CipherView[]>;
+  abstract clearCache(userId: UserId): Promise<void>;
+  abstract encrypt(
     model: CipherView,
     userId: UserId,
     keyForEncryption?: SymmetricCryptoKey,
     keyForCipherKeyDecryption?: SymmetricCryptoKey,
     originalCipher?: Cipher,
-  ) => Promise<Cipher>;
-  encryptFields: (fieldsModel: FieldView[], key: SymmetricCryptoKey) => Promise<Field[]>;
-  encryptField: (fieldModel: FieldView, key: SymmetricCryptoKey) => Promise<Field>;
-  get: (id: string) => Promise<Cipher>;
-  getAll: () => Promise<Cipher[]>;
-  getAllDecrypted: () => Promise<CipherView[]>;
-  getAllDecryptedForGrouping: (groupingId: string, folder?: boolean) => Promise<CipherView[]>;
-  getAllDecryptedForUrl: (
+  ): Promise<Cipher>;
+  abstract encryptFields(fieldsModel: FieldView[], key: SymmetricCryptoKey): Promise<Field[]>;
+  abstract encryptField(fieldModel: FieldView, key: SymmetricCryptoKey): Promise<Field>;
+  abstract get(id: string, userId: UserId): Promise<Cipher>;
+  abstract getAll(userId: UserId): Promise<Cipher[]>;
+  abstract getAllDecrypted(userId: UserId): Promise<CipherView[]>;
+  abstract getAllDecryptedForGrouping(
+    groupingId: string,
+    userId: UserId,
+    folder?: boolean,
+  ): Promise<CipherView[]>;
+  abstract getAllDecryptedForUrl(
     url: string,
+    userId: UserId,
     includeOtherTypes?: CipherType[],
     defaultMatch?: UriMatchStrategySetting,
-  ) => Promise<CipherView[]>;
-  filterCiphersForUrl: (
+  ): Promise<CipherView[]>;
+  abstract filterCiphersForUrl(
     ciphers: CipherView[],
     url: string,
     includeOtherTypes?: CipherType[],
     defaultMatch?: UriMatchStrategySetting,
-  ) => Promise<CipherView[]>;
-  getAllFromApiForOrganization: (organizationId: string) => Promise<CipherView[]>;
+  ): Promise<CipherView[]>;
+  abstract getAllFromApiForOrganization(organizationId: string): Promise<CipherView[]>;
   /**
    * Gets ciphers belonging to the specified organization that the user has explicit collection level access to.
    * Ciphers that are not assigned to any collections are only included for users with admin access.
    */
-  getManyFromApiForOrganization: (organizationId: string) => Promise<CipherView[]>;
-  getLastUsedForUrl: (url: string, autofillOnPageLoad: boolean) => Promise<CipherView>;
-  getLastLaunchedForUrl: (url: string, autofillOnPageLoad: boolean) => Promise<CipherView>;
-  getNextCipherForUrl: (url: string) => Promise<CipherView>;
-  updateLastUsedIndexForUrl: (url: string) => void;
-  updateLastUsedDate: (id: string) => Promise<void>;
-  updateLastLaunchedDate: (id: string) => Promise<void>;
-  saveNeverDomain: (domain: string) => Promise<void>;
+  abstract getManyFromApiForOrganization(organizationId: string): Promise<CipherView[]>;
+  abstract getLastUsedForUrl(
+    url: string,
+    userId: UserId,
+    autofillOnPageLoad: boolean,
+  ): Promise<CipherView>;
+  abstract getLastLaunchedForUrl(
+    url: string,
+    userId: UserId,
+    autofillOnPageLoad: boolean,
+  ): Promise<CipherView>;
+  abstract getNextCipherForUrl(url: string, userId: UserId): Promise<CipherView>;
+  abstract updateLastUsedIndexForUrl(url: string): void;
+  abstract updateLastUsedDate(id: string, userId: UserId): Promise<void>;
+  abstract updateLastLaunchedDate(id: string, userId: UserId): Promise<void>;
+  abstract saveNeverDomain(domain: string): Promise<void>;
   /**
    * Create a cipher with the server
    *
@@ -78,7 +91,7 @@ export abstract class CipherService implements UserKeyRotationDataProvider<Ciphe
    *
    * @returns A promise that resolves to the created cipher
    */
-  createWithServer: (cipher: Cipher, orgAdmin?: boolean) => Promise<Cipher>;
+  abstract createWithServer(cipher: Cipher, orgAdmin?: boolean): Promise<Cipher>;
   /**
    * Update a cipher with the server
    * @param cipher The cipher to update
@@ -87,88 +100,105 @@ export abstract class CipherService implements UserKeyRotationDataProvider<Ciphe
    *
    * @returns A promise that resolves to the updated cipher
    */
-  updateWithServer: (cipher: Cipher, orgAdmin?: boolean, isNotClone?: boolean) => Promise<Cipher>;
-  shareWithServer: (
+  abstract updateWithServer(
+    cipher: Cipher,
+    orgAdmin?: boolean,
+    isNotClone?: boolean,
+  ): Promise<Cipher>;
+  abstract shareWithServer(
     cipher: CipherView,
     organizationId: string,
     collectionIds: string[],
     userId: UserId,
-  ) => Promise<Cipher>;
-  shareManyWithServer: (
+  ): Promise<Cipher>;
+  abstract shareManyWithServer(
     ciphers: CipherView[],
     organizationId: string,
     collectionIds: string[],
     userId: UserId,
-  ) => Promise<any>;
-  saveAttachmentWithServer: (
+  ): Promise<any>;
+  abstract saveAttachmentWithServer(
     cipher: Cipher,
     unencryptedFile: any,
     userId: UserId,
     admin?: boolean,
-  ) => Promise<Cipher>;
-  saveAttachmentRawWithServer: (
+  ): Promise<Cipher>;
+  abstract saveAttachmentRawWithServer(
     cipher: Cipher,
     filename: string,
     data: ArrayBuffer,
     userId: UserId,
     admin?: boolean,
-  ) => Promise<Cipher>;
+  ): Promise<Cipher>;
   /**
    * Save the collections for a cipher with the server
    *
    * @param cipher The cipher to save collections for
+   * @param userId The user ID
    *
    * @returns A promise that resolves when the collections have been saved
    */
-  saveCollectionsWithServer: (cipher: Cipher) => Promise<Cipher>;
+  abstract saveCollectionsWithServer(cipher: Cipher, userId: UserId): Promise<Cipher>;
 
   /**
    * Save the collections for a cipher with the server as an admin.
    * Used for Unassigned ciphers or when the user only has admin access to the cipher (not assigned normally).
    * @param cipher
    */
-  saveCollectionsWithServerAdmin: (cipher: Cipher) => Promise<Cipher>;
+  abstract saveCollectionsWithServerAdmin(cipher: Cipher): Promise<Cipher>;
   /**
    * Bulk update collections for many ciphers with the server
    * @param orgId
+   * @param userId
    * @param cipherIds
    * @param collectionIds
    * @param removeCollections - If true, the collections will be removed from the ciphers, otherwise they will be added
    */
-  bulkUpdateCollectionsWithServer: (
+  abstract bulkUpdateCollectionsWithServer(
     orgId: OrganizationId,
+    userId: UserId,
     cipherIds: CipherId[],
     collectionIds: CollectionId[],
     removeCollections: boolean,
-  ) => Promise<void>;
+  ): Promise<void>;
   /**
    * Update the local store of CipherData with the provided data. Values are upserted into the existing store.
    *
    * @param cipher The cipher data to upsert. Can be a single CipherData object or an array of CipherData objects.
    * @returns A promise that resolves to a record of updated cipher store, keyed by their cipher ID. Returns all ciphers, not just those updated
    */
-  upsert: (cipher: CipherData | CipherData[]) => Promise<Record<CipherId, CipherData>>;
-  replace: (ciphers: { [id: string]: CipherData }, userId: UserId) => Promise<any>;
-  clear: (userId?: string) => Promise<void>;
-  moveManyWithServer: (ids: string[], folderId: string) => Promise<any>;
-  delete: (id: string | string[]) => Promise<any>;
-  deleteWithServer: (id: string, asAdmin?: boolean) => Promise<any>;
-  deleteManyWithServer: (ids: string[], asAdmin?: boolean) => Promise<any>;
-  deleteAttachment: (id: string, revisionDate: string, attachmentId: string) => Promise<CipherData>;
-  deleteAttachmentWithServer: (id: string, attachmentId: string) => Promise<CipherData>;
-  sortCiphersByLastUsed: (a: CipherView, b: CipherView) => number;
-  sortCiphersByLastUsedThenName: (a: CipherView, b: CipherView) => number;
-  getLocaleSortingFunction: () => (a: CipherView, b: CipherView) => number;
-  softDelete: (id: string | string[]) => Promise<any>;
-  softDeleteWithServer: (id: string, asAdmin?: boolean) => Promise<any>;
-  softDeleteManyWithServer: (ids: string[], asAdmin?: boolean) => Promise<any>;
-  restore: (
+  abstract upsert(cipher: CipherData | CipherData[]): Promise<Record<CipherId, CipherData>>;
+  abstract replace(ciphers: { [id: string]: CipherData }, userId: UserId): Promise<any>;
+  abstract clear(userId?: string): Promise<void>;
+  abstract moveManyWithServer(ids: string[], folderId: string, userId: UserId): Promise<any>;
+  abstract delete(id: string | string[], userId: UserId): Promise<any>;
+  abstract deleteWithServer(id: string, userId: UserId, asAdmin?: boolean): Promise<any>;
+  abstract deleteManyWithServer(ids: string[], userId: UserId, asAdmin?: boolean): Promise<any>;
+  abstract deleteAttachment(
+    id: string,
+    revisionDate: string,
+    attachmentId: string,
+    userId: UserId,
+  ): Promise<CipherData>;
+  abstract deleteAttachmentWithServer(
+    id: string,
+    attachmentId: string,
+    userId: UserId,
+  ): Promise<CipherData>;
+  abstract sortCiphersByLastUsed(a: CipherView, b: CipherView): number;
+  abstract sortCiphersByLastUsedThenName(a: CipherView, b: CipherView): number;
+  abstract getLocaleSortingFunction(): (a: CipherView, b: CipherView) => number;
+  abstract softDelete(id: string | string[], userId: UserId): Promise<any>;
+  abstract softDeleteWithServer(id: string, userId: UserId, asAdmin?: boolean): Promise<any>;
+  abstract softDeleteManyWithServer(ids: string[], userId: UserId, asAdmin?: boolean): Promise<any>;
+  abstract restore(
     cipher: { id: string; revisionDate: string } | { id: string; revisionDate: string }[],
-  ) => Promise<any>;
-  restoreWithServer: (id: string, asAdmin?: boolean) => Promise<any>;
-  restoreManyWithServer: (ids: string[], orgId?: string) => Promise<void>;
-  getKeyForCipherKeyDecryption: (cipher: Cipher, userId: UserId) => Promise<any>;
-  setAddEditCipherInfo: (value: AddEditCipherInfo) => Promise<void>;
+    userId: UserId,
+  ): Promise<any>;
+  abstract restoreWithServer(id: string, userId: UserId, asAdmin?: boolean): Promise<any>;
+  abstract restoreManyWithServer(ids: string[], orgId?: string): Promise<void>;
+  abstract getKeyForCipherKeyDecryption(cipher: Cipher, userId: UserId): Promise<any>;
+  abstract setAddEditCipherInfo(value: AddEditCipherInfo, userId: UserId): Promise<void>;
   /**
    * Returns user ciphers re-encrypted with the new user key.
    * @param originalUserKey the original user key
@@ -177,11 +207,11 @@ export abstract class CipherService implements UserKeyRotationDataProvider<Ciphe
    * @throws Error if new user key is null
    * @returns a list of user ciphers that have been re-encrypted with the new user key
    */
-  getRotatedData: (
+  abstract getRotatedData(
     originalUserKey: UserKey,
     newUserKey: UserKey,
     userId: UserId,
-  ) => Promise<CipherWithIdRequest[]>;
-  getNextCardCipher: () => Promise<CipherView>;
-  getNextIdentityCipher: () => Promise<CipherView>;
+  ): Promise<CipherWithIdRequest[]>;
+  abstract getNextCardCipher(userId: UserId): Promise<CipherView>;
+  abstract getNextIdentityCipher(userId: UserId): Promise<CipherView>;
 }