@eluvio/elv-client-js 4.2.22 → 4.2.23

package/dist/src/client/NTP.js

@@ -244,53 +244,6 @@ exports.DeleteNTPInstance = /*#__PURE__*/function () {
   };
 }();
 
-/**
- * Generate a report for the specified NTP instance.
- *
- * @methodGroup NTP Instances
- * @namedParams
- * @param {string} tenantId - The ID of the tenant in which this NTP instance was created
- * @param {string} ntpId - The ID of the NTP instance
- * @param {string} password - The code associated with the NTP instance
- * @param {string=} email - Email address associated with the code
- */
-exports.ReportNTPInstance = /*#__PURE__*/function () {
-  var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref9) {
-    var tenantId, ntpId, password, email, paramsJSON, res;
-    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-      while (1) switch (_context5.prev = _context5.next) {
-        case 0:
-          tenantId = _ref9.tenantId, ntpId = _ref9.ntpId, password = _ref9.password, email = _ref9.email;
-          ValidatePresence("tenantId", tenantId);
-          ValidatePresence("ntpId", ntpId);
-          paramsJSON = [];
-          if (password) {
-            paramsJSON.push("pwd:".concat(password));
-          }
-          if (email) {
-            paramsJSON.push("eml:".concat(email));
-          }
-          _context5.next = 8;
-          return this.authClient.MakeKMSCall({
-            tenantId: tenantId,
-            methodName: "elv_updateOTPInstance",
-            params: [tenantId, ntpId, "report", JSON.stringify(paramsJSON), Date.now()],
-            paramTypes: ["string", "string", "string", "string", "int"]
-          });
-        case 8:
-          res = _context5.sent;
-          return _context5.abrupt("return", res || {});
-        case 10:
-        case "end":
-          return _context5.stop();
-      }
-    }, _callee5, this);
-  }));
-  return function (_x5) {
-    return _ref10.apply(this, arguments);
-  };
-}();
-
 /**
  * Retrieve info for NTP instances in the specified tenant
  *
@@ -303,14 +256,14 @@ exports.ReportNTPInstance = /*#__PURE__*/function () {
  * @return {Object} - List of NTP instances along with pagination information
  */
 exports.ListNTPInstances = /*#__PURE__*/function () {
-  var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(_ref11) {
-    var tenantId, _ref11$count, count, _ref11$offset, offset, _yield$this$authClien2, Defs, Total;
-    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-      while (1) switch (_context6.prev = _context6.next) {
+  var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref9) {
+    var tenantId, _ref9$count, count, _ref9$offset, offset, _yield$this$authClien2, Defs, Total;
+    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+      while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          tenantId = _ref11.tenantId, _ref11$count = _ref11.count, count = _ref11$count === void 0 ? 10 : _ref11$count, _ref11$offset = _ref11.offset, offset = _ref11$offset === void 0 ? 0 : _ref11$offset;
+          tenantId = _ref9.tenantId, _ref9$count = _ref9.count, count = _ref9$count === void 0 ? 10 : _ref9$count, _ref9$offset = _ref9.offset, offset = _ref9$offset === void 0 ? 0 : _ref9$offset;
           ValidatePresence("tenantId", tenantId);
-          _context6.next = 4;
+          _context5.next = 4;
           return this.authClient.MakeKMSCall({
             tenantId: tenantId,
             methodName: "elv_listOTPInfo",
@@ -319,10 +272,10 @@ exports.ListNTPInstances = /*#__PURE__*/function () {
             signature: false
           });
         case 4:
-          _yield$this$authClien2 = _context6.sent;
+          _yield$this$authClien2 = _context5.sent;
           Defs = _yield$this$authClien2.Defs;
           Total = _yield$this$authClien2.Total;
-          return _context6.abrupt("return", {
+          return _context5.abrupt("return", {
             ntpInstances: Object.values(Defs || {}).map(FormatNTPInfo),
             start: offset,
             end: Math.min(Total, offset + count),
@@ -330,12 +283,12 @@ exports.ListNTPInstances = /*#__PURE__*/function () {
           });
         case 8:
         case "end":
-          return _context6.stop();
+          return _context5.stop();
       }
-    }, _callee6, this);
+    }, _callee5, this);
   }));
-  return function (_x6) {
-    return _ref12.apply(this, arguments);
+  return function (_x5) {
+    return _ref10.apply(this, arguments);
   };
 }();
 
@@ -350,16 +303,16 @@ exports.ListNTPInstances = /*#__PURE__*/function () {
  * @return {Object} - Info about the NTP instance
  */
 exports.NTPInstance = /*#__PURE__*/function () {
-  var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref13) {
+  var _ref12 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(_ref11) {
     var tenantId, ntpId;
-    return _regeneratorRuntime.wrap(function _callee7$(_context7) {
-      while (1) switch (_context7.prev = _context7.next) {
+    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+      while (1) switch (_context6.prev = _context6.next) {
         case 0:
-          tenantId = _ref13.tenantId, ntpId = _ref13.ntpId;
+          tenantId = _ref11.tenantId, ntpId = _ref11.ntpId;
           ValidatePresence("tenantId", tenantId);
           ValidatePresence("ntpId", ntpId);
-          _context7.t0 = FormatNTPInfo;
-          _context7.next = 6;
+          _context6.t0 = FormatNTPInfo;
+          _context6.next = 6;
           return this.authClient.MakeKMSCall({
             tenantId: tenantId,
             methodName: "elv_getOTPInfo",
@@ -368,16 +321,16 @@ exports.NTPInstance = /*#__PURE__*/function () {
             signature: false
           });
         case 6:
-          _context7.t1 = _context7.sent;
-          return _context7.abrupt("return", (0, _context7.t0)(_context7.t1));
+          _context6.t1 = _context6.sent;
+          return _context6.abrupt("return", (0, _context6.t0)(_context6.t1));
         case 8:
         case "end":
-          return _context7.stop();
+          return _context6.stop();
       }
-    }, _callee7, this);
+    }, _callee6, this);
   }));
-  return function (_x7) {
-    return _ref14.apply(this, arguments);
+  return function (_x6) {
+    return _ref12.apply(this, arguments);
   };
 }();
 
@@ -398,12 +351,12 @@ exports.NTPInstance = /*#__PURE__*/function () {
  * @return {Promise<Object>} - The generated ticket code and additional information about the ticket.
  */
 exports.IssueNTPCode = /*#__PURE__*/function () {
-  var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref15) {
+  var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref13) {
     var tenantId, ntpId, email, maxRedemptions, options, params, paramTypes;
-    return _regeneratorRuntime.wrap(function _callee8$(_context8) {
-      while (1) switch (_context8.prev = _context8.next) {
+    return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
         case 0:
-          tenantId = _ref15.tenantId, ntpId = _ref15.ntpId, email = _ref15.email, maxRedemptions = _ref15.maxRedemptions;
+          tenantId = _ref13.tenantId, ntpId = _ref13.ntpId, email = _ref13.email, maxRedemptions = _ref13.maxRedemptions;
           ValidatePresence("tenantId", tenantId);
           ValidatePresence("ntpId", ntpId);
           options = [];
@@ -415,22 +368,22 @@ exports.IssueNTPCode = /*#__PURE__*/function () {
           }
           params = [tenantId, ntpId, JSON.stringify(options), Date.now()];
           paramTypes = ["string", "string", "string", "uint"];
-          _context8.next = 10;
+          _context7.next = 10;
           return this.authClient.MakeKMSCall({
             methodName: "elv_issueOTPCode",
             params: params,
             paramTypes: paramTypes
           });
         case 10:
-          return _context8.abrupt("return", _context8.sent);
+          return _context7.abrupt("return", _context7.sent);
         case 11:
         case "end":
-          return _context8.stop();
+          return _context7.stop();
       }
-    }, _callee8, this);
+    }, _callee7, this);
   }));
-  return function (_x8) {
-    return _ref16.apply(this, arguments);
+  return function (_x7) {
+    return _ref14.apply(this, arguments);
   };
 }();
 
@@ -451,13 +404,13 @@ exports.IssueNTPCode = /*#__PURE__*/function () {
  * @return {Promise<Object>} - The generated signed ticket code and additional information about the ticket.
  */
 exports.IssueSignedNTPCode = /*#__PURE__*/function () {
-  var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(_ref17) {
+  var _ref16 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8(_ref15) {
     var tenantId, ntpId, email, maxRedemptions, result, signature, multiSig;
-    return _regeneratorRuntime.wrap(function _callee9$(_context9) {
-      while (1) switch (_context9.prev = _context9.next) {
+    return _regeneratorRuntime.wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
         case 0:
-          tenantId = _ref17.tenantId, ntpId = _ref17.ntpId, email = _ref17.email, maxRedemptions = _ref17.maxRedemptions;
-          _context9.next = 3;
+          tenantId = _ref15.tenantId, ntpId = _ref15.ntpId, email = _ref15.email, maxRedemptions = _ref15.maxRedemptions;
+          _context8.next = 3;
           return this.IssueNTPCode({
             tenantId: tenantId,
             ntpId: ntpId,
@@ -465,75 +418,27 @@ exports.IssueSignedNTPCode = /*#__PURE__*/function () {
             maxRedemptions: maxRedemptions
           });
         case 3:
-          result = _context9.sent;
+          result = _context8.sent;
           if (!result.token) {
-            _context9.next = 10;
+            _context8.next = 10;
             break;
           }
-          _context9.next = 7;
+          _context8.next = 7;
           return this.authClient.Sign(Ethers.utils.keccak256(Ethers.utils.toUtf8Bytes(result.token)));
         case 7:
-          signature = _context9.sent;
+          signature = _context8.sent;
           multiSig = this.utils.FormatSignature(signature);
           result.token = "".concat(result.token, ".").concat(this.utils.B64(multiSig));
         case 10:
-          return _context9.abrupt("return", result);
+          return _context8.abrupt("return", result);
         case 11:
         case "end":
-          return _context9.stop();
-      }
-    }, _callee9, this);
-  }));
-  return function (_x9) {
-    return _ref18.apply(this, arguments);
-  };
-}();
-
-/**
- * Check the status of the specified ticket/code without redeeming it.
- *
- * @methodGroup Tickets
- * @namedParams
- * @param {string} tenantId - The ID of the tenant from which the ticket was issued
- * @param {string} ntpId - The ID of the NTP instance from which the ticket was issued
- * @param {string} code - Access code
- * @param {string=} email - Email address associated with the code
- *
- * @return {Promise<Object>} - Status information for the ticket
- */
-exports.NTPStatus = /*#__PURE__*/function () {
-  var _ref20 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref19) {
-    var tenantId, ntpId, code, email, response;
-    return _regeneratorRuntime.wrap(function _callee10$(_context10) {
-      while (1) switch (_context10.prev = _context10.next) {
-        case 0:
-          tenantId = _ref19.tenantId, ntpId = _ref19.ntpId, code = _ref19.code, email = _ref19.email;
-          ValidatePresence("tenantId", tenantId);
-          ValidatePresence("ntpId", ntpId);
-          ValidatePresence("code", code);
-          _context10.next = 6;
-          return this.HttpClient.Request({
-            method: "POST",
-            path: UrlJoin("ks", "otp", "ntp", tenantId, ntpId, "status"),
-            body: {
-              "_PASSWORD": code,
-              "_EMAIL": email
-            }
-          });
-        case 6:
-          response = _context10.sent;
-          _context10.next = 9;
-          return response.json();
-        case 9:
-          return _context10.abrupt("return", _context10.sent);
-        case 10:
-        case "end":
-          return _context10.stop();
+          return _context8.stop();
       }
-    }, _callee10, this);
+    }, _callee8, this);
   }));
-  return function (_x10) {
-    return _ref20.apply(this, arguments);
+  return function (_x8) {
+    return _ref16.apply(this, arguments);
   };
 }();
 
@@ -552,12 +457,12 @@ exports.NTPStatus = /*#__PURE__*/function () {
  * @return {Promise<string|Object>} - The object ID which the ticket is authorized to, or an object containing the object ID and NTP ID if `includeNTPId` is specified
  */
 exports.RedeemCode = /*#__PURE__*/function () {
-  var _ref22 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref21) {
-    var issuer, tenantId, ntpId, code, email, _ref21$includeNTPId, includeNTPId, wallet, token, response, objectId, libraryId, Hash, codeHash, codeInfo, ak, sites, info, signer;
-    return _regeneratorRuntime.wrap(function _callee11$(_context11) {
-      while (1) switch (_context11.prev = _context11.next) {
+  var _ref18 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9(_ref17) {
+    var issuer, tenantId, ntpId, code, email, _ref17$includeNTPId, includeNTPId, wallet, token, response, objectId, libraryId, Hash, codeHash, codeInfo, ak, sites, info, signer;
+    return _regeneratorRuntime.wrap(function _callee9$(_context9) {
+      while (1) switch (_context9.prev = _context9.next) {
         case 0:
-          issuer = _ref21.issuer, tenantId = _ref21.tenantId, ntpId = _ref21.ntpId, code = _ref21.code, email = _ref21.email, _ref21$includeNTPId = _ref21.includeNTPId, includeNTPId = _ref21$includeNTPId === void 0 ? false : _ref21$includeNTPId;
+          issuer = _ref17.issuer, tenantId = _ref17.tenantId, ntpId = _ref17.ntpId, code = _ref17.code, email = _ref17.email, _ref17$includeNTPId = _ref17.includeNTPId, includeNTPId = _ref17$includeNTPId === void 0 ? false : _ref17$includeNTPId;
           wallet = this.GenerateWallet();
           issuer = issuer || "";
           if (!this.signer) {
@@ -568,15 +473,15 @@ exports.RedeemCode = /*#__PURE__*/function () {
             });
           }
           if (!issuer.startsWith("iq__")) {
-            _context11.next = 8;
+            _context9.next = 8;
             break;
           }
           ValidateObject(issuer);
-          _context11.next = 28;
+          _context9.next = 28;
           break;
         case 8:
           if (!(issuer && !issuer.replace(/^\//, "").startsWith("otp/ntp/iten"))) {
-            _context11.next = 12;
+            _context9.next = 12;
             break;
           }
           throw Error("Invalid issuer: " + issuer);
@@ -587,38 +492,38 @@ exports.RedeemCode = /*#__PURE__*/function () {
           if (!issuer) {
             issuer = UrlJoin("/otp", "ntp", tenantId, ntpId || "");
           }
-          _context11.prev = 14;
-          _context11.next = 17;
+          _context9.prev = 14;
+          _context9.next = 17;
           return this.authClient.GenerateChannelContentToken({
             issuer: issuer,
             code: code,
             email: email
           });
         case 17:
-          token = _context11.sent;
+          token = _context9.sent;
           this.SetStaticToken({
             token: token
           });
           response = JSON.parse(this.utils.FromB64(token));
-          return _context11.abrupt("return", includeNTPId ? {
+          return _context9.abrupt("return", includeNTPId ? {
             objectId: response.qid,
             ntpId: response.oid
           } : response.qid);
         case 23:
-          _context11.prev = 23;
-          _context11.t0 = _context11["catch"](14);
+          _context9.prev = 23;
+          _context9.t0 = _context9["catch"](14);
           this.Log("Failed to redeem code:", true);
-          this.Log(_context11.t0, true);
-          throw _context11.t0;
+          this.Log(_context9.t0, true);
+          throw _context9.t0;
         case 28:
           // Site selector
           objectId = issuer;
-          _context11.next = 31;
+          _context9.next = 31;
           return this.ContentObjectLibraryId({
             objectId: objectId
           });
         case 31:
-          libraryId = _context11.sent;
+          libraryId = _context9.sent;
           Hash = function Hash(code) {
             var chars = code.split("").map(function (code) {
               return code.charCodeAt(0);
@@ -628,49 +533,49 @@ exports.RedeemCode = /*#__PURE__*/function () {
             }, 0).toString();
           };
           codeHash = Hash(code);
-          _context11.next = 36;
+          _context9.next = 36;
           return this.ContentObjectMetadata({
             libraryId: libraryId,
             objectId: objectId,
             metadataSubtree: "public/codes/".concat(codeHash)
           });
         case 36:
-          codeInfo = _context11.sent;
+          codeInfo = _context9.sent;
           if (codeInfo) {
-            _context11.next = 40;
+            _context9.next = 40;
             break;
           }
           this.Log("Code redemption failed:\n\t".concat(issuer, "\n\t").concat(code));
           throw Error("Invalid code: " + code);
         case 40:
           ak = codeInfo.ak, sites = codeInfo.sites, info = codeInfo.info;
-          _context11.next = 43;
+          _context9.next = 43;
           return wallet.AddAccountFromEncryptedPK({
             encryptedPrivateKey: this.utils.FromB64(ak),
             password: code
           });
         case 43:
-          signer = _context11.sent;
+          signer = _context9.sent;
           this.SetSigner({
             signer: signer
           });
 
           // Ensure wallet is initialized
-          _context11.next = 47;
+          _context9.next = 47;
           return this.userProfileClient.WalletAddress();
         case 47:
-          return _context11.abrupt("return", {
+          return _context9.abrupt("return", {
             addr: this.utils.FormatAddress(signer.address),
             sites: sites,
             info: info || {}
           });
         case 48:
         case "end":
-          return _context11.stop();
+          return _context9.stop();
       }
-    }, _callee11, this, [[14, 23]]);
+    }, _callee9, this, [[14, 23]]);
   }));
-  return function (_x11) {
-    return _ref22.apply(this, arguments);
+  return function (_x9) {
+    return _ref18.apply(this, arguments);
   };
 }();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.2.22",
+  "version": "4.2.23",
   "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/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);