From e1d4c4c90370585d28e12c1ec451e8f55851bb88 Mon Sep 17 00:00:00 2001
From: Oscar Hinton <oscar@oscarhinton.com>
Date: Tue, 25 Jan 2022 15:45:02 +0100
Subject: [PATCH] Expose getKeyFromStorage with userId (#633)

---
 common/src/abstractions/crypto.service.ts       | 2 +-
 electron/src/services/electronCrypto.service.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/src/abstractions/crypto.service.ts b/common/src/abstractions/crypto.service.ts
index 4e861952..3397d0d5 100644
--- a/common/src/abstractions/crypto.service.ts
+++ b/common/src/abstractions/crypto.service.ts
@@ -21,7 +21,7 @@ export abstract class CryptoService {
   ) => Promise<void>;
   setProviderKeys: (orgs: ProfileProviderResponse[]) => Promise<void>;
   getKey: (keySuffix?: KeySuffixOptions, userId?: string) => Promise<SymmetricCryptoKey>;
-  getKeyFromStorage: (keySuffix: KeySuffixOptions) => Promise<SymmetricCryptoKey>;
+  getKeyFromStorage: (keySuffix: KeySuffixOptions, userId?: string) => Promise<SymmetricCryptoKey>;
   getKeyHash: () => Promise<string>;
   compareAndUpdateKeyHash: (masterPassword: string, key: SymmetricCryptoKey) => Promise<boolean>;
   getEncKey: (key?: SymmetricCryptoKey) => Promise<SymmetricCryptoKey>;
diff --git a/electron/src/services/electronCrypto.service.ts b/electron/src/services/electronCrypto.service.ts
index a98ad0d4..7eb01e49 100644
--- a/electron/src/services/electronCrypto.service.ts
+++ b/electron/src/services/electronCrypto.service.ts
@@ -38,9 +38,9 @@ export class ElectronCryptoService extends CryptoService {
     }
   }
 
-  protected async retrieveKeyFromStorage(keySuffix: KeySuffixOptions) {
+  protected async retrieveKeyFromStorage(keySuffix: KeySuffixOptions, userId?: string) {
     await this.upgradeSecurelyStoredKey();
-    return super.retrieveKeyFromStorage(keySuffix);
+    return super.retrieveKeyFromStorage(keySuffix, userId);
   }
 
   /**