@eluvio/elv-client-js 4.2.22 → 4.2.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.2.22",
+  "version": "4.2.24",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",

package/src/Crypto.js

@@ -82,7 +82,19 @@ const Crypto = {
     return Utils.B64(cap);
   },
 
-  async DecryptCap(encryptedCap, privateKey) {
+  // accepts either a raw private key string (legacy usage) or a signer
+  async DecryptCap(encryptedCap, signerOrPrivateKey) {
+    let privateKey;
+    if(typeof signerOrPrivateKey === "string") {
+      privateKey = signerOrPrivateKey;
+    } else if(signerOrPrivateKey && signerOrPrivateKey.remoteSigner) {
+      return await signerOrPrivateKey.DecryptCap(encryptedCap);
+    } else if(signerOrPrivateKey && typeof signerOrPrivateKey._signingKey === "function") {
+      privateKey = signerOrPrivateKey._signingKey().privateKey;
+    } else {
+      throw Error("Crypto.DecryptCap: second argument must be a signer or a private key string");
+    }
+
     const elvCrypto = await Crypto.ElvCrypto();
     privateKey = new Uint8Array(Buffer.from(privateKey.replace("0x", ""), "hex"));
 

package/src/ElvClient.js

@@ -1348,9 +1348,7 @@ class ElvClient {
 
     ValidatePresence("message", message);
 
-    return this.signer.remoteSigner ?
-      await this.signer.DecryptCap(message) :
-      await this.Crypto.DecryptCap(message, this.signer._signingKey().privateKey);
+    return await this.Crypto.DecryptCap(message, this.signer);
   }
 
   /**

package/src/FrameClient.js

@@ -449,10 +449,12 @@ class FrameClient {
       "ObjectCleanup",
       "OutputsCreate",
       "OutputsDelete",
+      "OutputsDeleteBatch",
       "OutputsList",
       "OutputsListItem",
       "OutputsModify",
       "OutputsModifyBatch",
+      "OutputsReset",
       "OutputsResolveSrtPullUrls",
       "OutputsState",
       "OutputsStop",

package/src/client/ContentAccess.js

@@ -2743,9 +2743,7 @@ exports.CreateEncryptionConk = async function({libraryId, objectId, versionHash,
     });
 
   if(existingUserCap) {
-    this.encryptionConks[objectId] = this.signer.remoteSigner ?
-      await this.signer.DecryptCap(existingUserCap) :
-      await this.Crypto.DecryptCap(existingUserCap, this.signer._signingKey().privateKey);
+    this.encryptionConks[objectId] = await this.Crypto.DecryptCap(existingUserCap, this.signer);
   } else {
     this.encryptionConks[objectId] = await this.Crypto.GeneratePrimaryConk({
       spaceId: this.contentSpaceId,
@@ -2848,9 +2846,7 @@ exports.EncryptionConk = async function({libraryId, objectId, versionHash, write
       });
 
     if(existingUserCap) {
-      this.encryptionConks[objectId] = this.signer.remoteSigner ?
-        await this.signer.DecryptCap(existingUserCap) :
-        await this.Crypto.DecryptCap(existingUserCap, this.signer._signingKey().privateKey);
+      this.encryptionConks[objectId] = await this.Crypto.DecryptCap(existingUserCap, this.signer);
     } else if(writeToken) {
       await this.CreateEncryptionConk({libraryId, objectId, versionHash, writeToken, createKMSConk: false});
     } else {

package/src/client/ContentManagement.js

@@ -680,9 +680,7 @@ exports.CopyContentObject = async function({libraryId, originalVersionHash, opti
   const userCapKey = `eluv.caps.iusr${this.utils.AddressToHash(this.signer.address)}`;
 
   if(metadata[userCapKey]) {
-    const userConkKey = this.signer.remoteSigner ?
-      await this.signer.DecryptCap(metadata[userCapKey]) :
-      await this.Crypto.DecryptCap(metadata[userCapKey], this.signer._signingKey().privateKey);
+    const userConkKey = await this.Crypto.DecryptCap(metadata[userCapKey], this.signer);
     userConkKey.qid = objectId;
 
     await this.ReplaceMetadata({
@@ -735,9 +733,7 @@ exports.CreateNonOwnerCap = async function({objectId, libraryId, publicKey, writ
     throw Error("No user cap found for current user");
   }
 
-  const userConk = this.signer.remoteSigner ?
-    await this.signer.DecryptCap(userCapValue) :
-    await this.Crypto.DecryptCap(userCapValue, this.signer._signingKey().privateKey);
+  const userConk = await this.Crypto.DecryptCap(userCapValue, this.signer);
 
   const publicAddress = this.utils.PublicKeyToAddress(publicKey);
 

package/src/client/Contracts.js

@@ -955,7 +955,7 @@ async function GetTenantGroupAddress({ctx, tenantContractId, groupName}) {
 
     return groupAddress;
   } catch (err) {
-    this.Log(err);
+    ctx.Log(err);
     throw new Error(`Failed to retrieve ${groupName} group address.`);
   }