From 5fced642fa00117f21585d9daa4b43352a8259fb Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Wed, 4 Dec 2019 17:30:27 +0000 Subject: [PATCH] Allow getSecretStorageKey to be async --- src/client.js | 2 +- src/crypto/SecretStorage.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/client.js b/src/client.js index be5578710..d0e320919 100644 --- a/src/client.js +++ b/src/client.js @@ -215,7 +215,7 @@ function keyFromRecoverySession(session, decryptionKey) { * @param {function} [opts.cryptoCallbacks.getSecretStorageKey] * Optional. Function called when an encryption key for secret storage * is required. One or more keys will be described in the keys object. - * The callback function should return with an array of: + * The callback function should return a promise with an array of: * [, ] or null if it cannot provide * any of the keys. * Args: diff --git a/src/crypto/SecretStorage.js b/src/crypto/SecretStorage.js index 266e910fa..c635d5b60 100644 --- a/src/crypto/SecretStorage.js +++ b/src/crypto/SecretStorage.js @@ -533,9 +533,7 @@ export default class SecretStorage extends EventEmitter { throw new Error("No getSecretStorageKey callback supplied"); } - const returned = await Promise.resolve( - this._cryptoCallbacks.getSecretStorageKey({keys}), - ); + const returned = await this._cryptoCallbacks.getSecretStorageKey({ keys }); if (!returned) { throw new Error("getSecretStorageKey callback returned falsey");