From d287fc80f1be5565152df389bede058856d95f61 Mon Sep 17 00:00:00 2001
From: Maciej Zieniuk <mzieniuk@bitwarden.com>
Date: Tue, 5 Nov 2024 12:48:46 +0000
Subject: [PATCH] PM-14445: Removed some types overrides

---
 libs/key-management/src/abstractions/key.service.ts | 8 ++++----
 libs/key-management/src/key.service.ts              | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libs/key-management/src/abstractions/key.service.ts b/libs/key-management/src/abstractions/key.service.ts
index 032ab6f5d68..b98e87cf836 100644
--- a/libs/key-management/src/abstractions/key.service.ts
+++ b/libs/key-management/src/abstractions/key.service.ts
@@ -161,10 +161,10 @@ export abstract class KeyService {
 
   /**
    * Generates a new user key
-   * @param masterKey The user's master key
+   * @param key The user's master key
    * @returns A new user key and the master key protected version of it
    */
-  abstract makeUserKey(key: MasterKey): Promise<[UserKey, EncString]>;
+  abstract makeUserKey(key: MasterKey | null): Promise<[UserKey, EncString]>;
 
   /**
    * Clears the user's stored version of the user key
@@ -178,7 +178,7 @@ export abstract class KeyService {
    * @param userKeyMasterKey The master key encrypted user key to set
    * @param userId The desired user
    */
-  abstract setMasterKeyEncryptedUserKey(UserKeyMasterKey: string, userId?: string): Promise<void>;
+  abstract setMasterKeyEncryptedUserKey(userKeyMasterKey: string, userId?: string): Promise<void>;
 
   /**
    * @param password The user's master password that will be used to derive a master key if one isn't found
@@ -254,7 +254,7 @@ export abstract class KeyService {
    *
    * @deprecated Use {@link orgKeys$} with a required {@link UserId} instead.
    */
-  abstract activeUserOrgKeys$: Observable<Record<OrganizationId, OrgKey>>;
+  abstract activeUserOrgKeys$: Observable<Record<OrganizationId, OrgKey> | null>;
 
   /**
    * Returns the organization's symmetric key
diff --git a/libs/key-management/src/key.service.ts b/libs/key-management/src/key.service.ts
index 1a67365f946..56b688a006b 100644
--- a/libs/key-management/src/key.service.ts
+++ b/libs/key-management/src/key.service.ts
@@ -65,7 +65,7 @@ export class DefaultKeyService implements KeyServiceAbstraction {
 
   readonly everHadUserKey$: Observable<boolean>;
 
-  readonly activeUserOrgKeys$: Observable<Record<OrganizationId, OrgKey>>;
+  readonly activeUserOrgKeys$: Observable<Record<OrganizationId, OrgKey> | null>;
 
   constructor(
     protected pinService: PinServiceAbstraction,
@@ -86,7 +86,7 @@ export class DefaultKeyService implements KeyServiceAbstraction {
 
     this.activeUserOrgKeys$ = this.stateProvider.activeUserId$.pipe(
       switchMap((userId) => (userId != null ? this.orgKeys$(userId) : NEVER)),
-    ) as Observable<Record<OrganizationId, OrgKey>>;
+    );
   }
 
   async setUserKey(key: UserKey | null, userId?: UserId): Promise<void> {
@@ -219,7 +219,7 @@ export class DefaultKeyService implements KeyServiceAbstraction {
     return (await this.getKeyFromStorage(keySuffix, userId)) != null;
   }
 
-  async makeUserKey(masterKey: MasterKey): Promise<[UserKey, EncString]> {
+  async makeUserKey(masterKey: MasterKey | null): Promise<[UserKey, EncString]> {
     if (!masterKey) {
       const userId = await firstValueFrom(this.stateProvider.activeUserId$);
       if (userId == null) {