@eluvio/elv-client-js 3.1.91 → 3.1.94

package/dist/src/AuthorizationClient.js

@@ -192,7 +192,7 @@ function () {
                 this.noCache = true;
               }
 
-              if (this.client.signer && this.client.signer.remoteSigner) {
+              if (channelAuth && this.client.signer && this.client.signer.remoteSigner) {
                 // Channel auth not supported for remote signer, use a self-signed no-auth token instead
                 noAuth = true;
                 channelAuth = false;
@@ -338,7 +338,7 @@ function () {
                 addr: Utils.FormatAddress(this.client.signer && this.client.signer.address || "")
               };
 
-              if (this.noAuth || noAuth) {
+              if (!(!(this.noAuth || noAuth) && !this.client.signer.remoteSigner)) {
                 _context3.next = 29;
                 break;
               }

package/dist/src/HttpClient.js

@@ -94,10 +94,10 @@ function () {
                 headers: this.RequestHeaders(bodyType, headers)
               };
 
-              if (method === "POST" || method === "PUT") {
+              if (method === "POST" || method === "PUT" || method === "DELETE") {
                 if (body && bodyType === "JSON") {
                   fetchParameters.body = JSON.stringify(body);
-                } else {
+                } else if (body) {
                   fetchParameters.body = body;
                 }
               }

package/dist/src/UserProfileClient.js

@@ -907,7 +907,8 @@ function () {
      * Note: This method is not accessible to applications. Eluvio core will drop the request.
      *
      * @namedParams
-     * @param level
+     * @param {string} id - The tenant ID in hash format
+     * @param {string} address - The group address to use in the hash if id is not provided
      */
 
   }, {
@@ -920,7 +921,7 @@ function () {
             case 0:
               id = _ref15.id, address = _ref15.address;
 
-              if (!(id && !id.startsWith("iten"))) {
+              if (!(id && (!id.startsWith("iten") || !Utils.ValidHash(id)))) {
                 _context13.next = 3;
                 break;
               }
@@ -928,51 +929,63 @@ function () {
               throw Error("Invalid tenant ID: ".concat(id));
 
             case 3:
-              if (address) {
-                id = "iten".concat(Utils.AddressToHash(address));
+              if (!address) {
+                _context13.next = 7;
+                break;
+              }
+
+              if (Utils.ValidAddress(address)) {
+                _context13.next = 6;
+                break;
               }
 
-              _context13.prev = 4;
-              _context13.next = 7;
+              throw Error("Invalid address: ".concat(address));
+
+            case 6:
+              id = "iten".concat(Utils.AddressToHash(address));
+
+            case 7:
+              _context13.prev = 7;
+              _context13.next = 10;
               return _regeneratorRuntime.awrap(this.client.AccessType({
                 id: id
               }));
 
-            case 7:
+            case 10:
               version = _context13.sent;
 
               if (!(version !== this.client.authClient.ACCESS_TYPES.GROUP)) {
-                _context13.next = 10;
+                _context13.next = 13;
                 break;
               }
 
               throw Error("Invalid tenant ID: " + id);
 
-            case 10:
-              _context13.next = 15;
+            case 13:
+              _context13.next = 18;
               break;
 
-            case 12:
-              _context13.prev = 12;
-              _context13.t0 = _context13["catch"](4);
+            case 15:
+              _context13.prev = 15;
+              _context13.t0 = _context13["catch"](7);
               throw Error("Invalid tenant ID: " + id);
 
-            case 15:
-              _context13.next = 17;
+            case 18:
+              _context13.next = 20;
               return _regeneratorRuntime.awrap(this.ReplaceUserMetadata({
                 metadataSubtree: "tenantId",
                 metadata: id
               }));
 
-            case 17:
+            case 20:
               this.tenantId = id;
 
-            case 18:
+            case 21:
             case "end":
               return _context13.stop();
           }
         }
-      }, null, this, [[4, 12]]);
+      }, null, this, [[7, 15]]);
     }
     /**
      * Get the URL of the current user's profile image

package/dist/src/Utils.js

@@ -6,6 +6,8 @@ var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 
 var _slicedToArray = require("@babel/runtime/helpers/slicedToArray");
 
+var _this = this;
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -22,7 +24,9 @@ var VarInt = require("varint");
 
 var URI = require("urijs");
 
-var keccak256 = require("ethers").utils.keccak256;
+var _require$utils = require("ethers").utils,
+    keccak256 = _require$utils.keccak256,
+    getAddress = _require$utils.getAddress;
 /**
  * @namespace
  * @description This is a utility namespace mostly containing functions for managing
@@ -161,6 +165,145 @@ var Utils = {
     };
   },
 
+  /**
+   * Decode the specified write token into its component parts
+   *
+   * @param writeToken
+   *
+   * @returns {Object} - Components of the write token.
+   */
+  DecodeWriteToken: function DecodeWriteToken(writeToken) {
+    /*
+    Format:
+    - content write token, LRO:
+      - prefix: "tq__", "tqw__", "tlro"
+      - format:
+        prefix + base58(uvarint(len(QID) | QID |
+                        uvarint(len(NID) | NID |
+                        uvarint(len(RAND_BYTES) | RAND_BYTES)
+    - content part write token:
+      - prefix: "tqp_"
+      - format:
+        prefix + base58(scheme | flags | uvarint(len(RAND_BYTES) | RAND_BYTES)
+    - content write token v1, content part write token v1:
+      - prefix: "tqw_", "tqpw"
+      - format:
+        prefix + base58(RAND_BYTES)
+     */
+    if (writeToken.length < 4) {
+      throw new Error("Invalid write token: [\"".concat(writeToken, "\"] (unknown prefix)"));
+    }
+
+    var tokenType;
+
+    if (writeToken.startsWith("tqw__")) {
+      tokenType = "tq__";
+      writeToken = writeToken.slice(5);
+    } else {
+      tokenType = writeToken.slice(0, 4);
+      writeToken = writeToken.slice(4);
+    }
+
+    if (writeToken.length === 0) {
+      throw new Error("Invalid write token: [\"".concat(writeToken, "\"] (too short)"));
+    }
+
+    switch (tokenType) {
+      case "tqw_":
+      case "tq__":
+      case "tqpw":
+      case "tqp_":
+      case "tlro":
+        break;
+
+      default:
+        throw new Error("Invalid write token: [\"".concat(writeToken, "\"] (unknown prefix)"));
+    } // decode base58 payload
+
+
+    var bytes = Utils.FromB58(writeToken);
+
+    function decodeBytes(isID, prefix) {
+      var bsize = VarInt.decode(bytes, 0); // decode: count of bytes to read
+
+      var offset = VarInt.decode.bytes; // offset in buffer to start read after decode
+
+      var theBytes;
+      var ret;
+
+      if (isID) {
+        theBytes = bytes.slice(offset + 1, bsize + offset); // skip 1st byte (code id) at offset 0
+
+        if (theBytes.length === 0) {
+          ret = "";
+        } else {
+          ret = prefix + Utils.B58(theBytes);
+        }
+      } else {
+        theBytes = bytes.slice(offset, bsize + offset);
+        ret = "0x" + theBytes.toString("hex");
+      }
+
+      bytes = bytes.slice(bsize + offset);
+      return ret;
+    }
+
+    var tokenId;
+    var qid;
+    var nid;
+    var scheme;
+    var flags;
+
+    switch (tokenType) {
+      case "tqw_": // content write token v1
+
+      case "tqpw":
+        // content part write token v1
+        tokenId = "0x" + bytes.toString("hex");
+        break;
+
+      case "tlro": // LRO,
+
+      case "tq__":
+        // content write token
+        qid = decodeBytes(true, "iq__");
+        nid = decodeBytes(true, "inod");
+        tokenId = decodeBytes(false, "");
+        break;
+
+      case "tqp_":
+        // content part write token
+        if (bytes.length < 3) {
+          throw new Error("Invalid write token: [\"".concat(writeToken, "\"] (token truncated)"));
+        }
+
+        scheme = bytes[0];
+        flags = bytes[1];
+        bytes = bytes.slice(2);
+        tokenId = decodeBytes(false, "");
+        break;
+
+      default:
+        // already raised
+        throw new Error("Invalid write token: [\"".concat(writeToken, "\"] (unknown prefix)"));
+    }
+
+    return {
+      tokenType: tokenType,
+      // type of token
+      tokenId: tokenId,
+      // random bytes generated by the fabric node
+      objectId: qid,
+      // content id for content write token (tq__) or LRO (tlro)
+      nodeId: nid,
+      // node id where the content write token is valid (tq__)
+      scheme: scheme,
+      // encryption scheme for part write token - (tqp_)
+      flags: flags // flags for part write token (tqp_)
+
+    };
+  },
+
   /**
    * Convert contract address to multiformat hash
    *
@@ -259,6 +402,35 @@ var Utils = {
     return Utils.HashToAddress(firstHash) === Utils.HashToAddress(secondHash);
   },
 
+  /**
+   * Determine whether the address is valid
+   *
+   * @param {string} address - Address to validate
+   *
+   * @returns {boolean} - Whether or not the address is valid
+   */
+  ValidAddress: function ValidAddress(address) {
+    try {
+      getAddress(address);
+      return true;
+    } catch (error) {
+      _this.Log(error);
+
+      return false;
+    }
+  },
+
+  /**
+   * Determine whether the hash is valid
+   *
+   * @param {string} hash - Hash to validate
+   *
+   * @returns {boolean} - Whether or not the hash is valid
+   */
+  ValidHash: function ValidHash(hash) {
+    return Utils.ValidAddress(Utils.HashToAddress(hash));
+  },
+
   /**
    * Convert the specified string to a bytes32 string
    *

package/dist/src/client/ContentAccess.js

@@ -465,37 +465,44 @@ exports.ContentType = function _callee6(_ref5) {
           }
 
           if (!name) {
-            _context6.next = 8;
+            _context6.next = 13;
             break;
           }
 
           this.Log("Looking up type by name in content space metadata..."); // Look up named type in content space metadata
 
-          _context6.next = 7;
+          _context6.prev = 5;
+          _context6.next = 8;
           return _regeneratorRuntime.awrap(this.ContentObjectMetadata({
             libraryId: this.contentSpaceLibraryId,
             objectId: this.contentSpaceObjectId,
             metadataSubtree: UrlJoin("public", "contentTypes", name)
           }));
 
-        case 7:
+        case 8:
           typeId = _context6.sent;
+          _context6.next = 13;
+          break;
 
-        case 8:
+        case 11:
+          _context6.prev = 11;
+          _context6.t0 = _context6["catch"](5);
+
+        case 13:
           if (typeId) {
-            _context6.next = 18;
+            _context6.next = 23;
             break;
           }
 
           this.Log("Looking up type by name in available types...");
-          _context6.next = 12;
+          _context6.next = 17;
           return _regeneratorRuntime.awrap(this.ContentTypes());
 
-        case 12:
+        case 17:
           types = _context6.sent;
 
           if (!name) {
-            _context6.next = 17;
+            _context6.next = 22;
             break;
           }
 
@@ -503,35 +510,35 @@ exports.ContentType = function _callee6(_ref5) {
             return (type.name || "").toLowerCase() === name.toLowerCase();
           }));
 
-        case 17:
+        case 22:
           return _context6.abrupt("return", Object.values(types).find(function (type) {
             return type.hash === versionHash;
           }));
 
-        case 18:
+        case 23:
           if (versionHash) {
-            _context6.next = 22;
+            _context6.next = 27;
             break;
           }
 
-          _context6.next = 21;
+          _context6.next = 26;
           return _regeneratorRuntime.awrap(this.LatestVersionHash({
             objectId: typeId
           }));
 
-        case 21:
+        case 26:
           versionHash = _context6.sent;
 
-        case 22:
-          _context6.prev = 22;
+        case 27:
+          _context6.prev = 27;
           this.Log("Looking up type by ID...");
 
           if (!publicOnly) {
-            _context6.next = 34;
+            _context6.next = 39;
             break;
           }
 
-          _context6.next = 27;
+          _context6.next = 32;
           return _regeneratorRuntime.awrap(this.ContentObjectMetadata({
             libraryId: this.contentSpaceLibraryId,
             objectId: typeId,
@@ -539,46 +546,46 @@ exports.ContentType = function _callee6(_ref5) {
             metadataSubtree: "public"
           }));
 
-        case 27:
-          _context6.t0 = _context6.sent;
+        case 32:
+          _context6.t1 = _context6.sent;
 
-          if (_context6.t0) {
-            _context6.next = 30;
+          if (_context6.t1) {
+            _context6.next = 35;
             break;
           }
 
-          _context6.t0 = {};
+          _context6.t1 = {};
 
-        case 30:
-          _context6.t1 = _context6.t0;
+        case 35:
+          _context6.t2 = _context6.t1;
           metadata = {
-            "public": _context6.t1
+            "public": _context6.t2
           };
-          _context6.next = 40;
+          _context6.next = 45;
           break;
 
-        case 34:
-          _context6.next = 36;
+        case 39:
+          _context6.next = 41;
           return _regeneratorRuntime.awrap(this.ContentObjectMetadata({
             libraryId: this.contentSpaceLibraryId,
             objectId: typeId,
             versionHash: versionHash
           }));
 
-        case 36:
-          _context6.t2 = _context6.sent;
+        case 41:
+          _context6.t3 = _context6.sent;
 
-          if (_context6.t2) {
-            _context6.next = 39;
+          if (_context6.t3) {
+            _context6.next = 44;
             break;
           }
 
-          _context6.t2 = {};
+          _context6.t3 = {};
 
-        case 39:
-          metadata = _context6.t2;
+        case 44:
+          metadata = _context6.t3;
 
-        case 40:
+        case 45:
           return _context6.abrupt("return", {
             id: typeId,
             hash: versionHash,
@@ -586,19 +593,19 @@ exports.ContentType = function _callee6(_ref5) {
             meta: metadata
           });
 
-        case 43:
-          _context6.prev = 43;
-          _context6.t3 = _context6["catch"](22);
+        case 48:
+          _context6.prev = 48;
+          _context6.t4 = _context6["catch"](27);
           this.Log("Error looking up content type:");
-          this.Log(_context6.t3);
+          this.Log(_context6.t4);
           throw new Error("Content Type ".concat(name || typeId, " is invalid"));
 
-        case 48:
+        case 53:
         case "end":
           return _context6.stop();
       }
     }
-  }, null, this, [[22, 43]]);
+  }, null, this, [[5, 11], [27, 48]]);
 };
 /**
  * List all content types accessible to this user.
@@ -631,25 +638,35 @@ exports.ContentTypes = function _callee8() {
           this.Log("Personally available types:");
           this.Log(typeAddresses); // Content space types
 
-          _context8.next = 9;
+          contentSpaceTypes = {};
+          _context8.prev = 8;
+          _context8.next = 11;
           return _regeneratorRuntime.awrap(this.ContentObjectMetadata({
             libraryId: this.contentSpaceLibraryId,
             objectId: this.contentSpaceObjectId,
             metadataSubtree: "public/contentTypes"
           }));
 
-        case 9:
+        case 11:
           _context8.t0 = _context8.sent;
 
           if (_context8.t0) {
-            _context8.next = 12;
+            _context8.next = 14;
             break;
           }
 
           _context8.t0 = {};
 
-        case 12:
+        case 14:
           contentSpaceTypes = _context8.t0;
+          _context8.next = 19;
+          break;
+
+        case 17:
+          _context8.prev = 17;
+          _context8.t1 = _context8["catch"](8);
+
+        case 19:
           contentSpaceTypeAddresses = Object.values(contentSpaceTypes).map(function (typeId) {
             return _this3.utils.HashToAddress(typeId);
           });
@@ -662,7 +679,7 @@ exports.ContentTypes = function _callee8() {
           }).filter(function (v, i, a) {
             return a.indexOf(v) === i;
           });
-          _context8.next = 19;
+          _context8.next = 25;
           return _regeneratorRuntime.awrap(Promise.all(typeAddresses.map(function _callee7(typeAddress) {
             var typeId;
             return _regeneratorRuntime.async(function _callee7$(_context7) {
@@ -702,15 +719,15 @@ exports.ContentTypes = function _callee8() {
             }, null, null, [[2, 8]]);
           })));
 
-        case 19:
+        case 25:
           return _context8.abrupt("return", this.contentTypes);
 
-        case 20:
+        case 26:
         case "end":
           return _context8.stop();
       }
     }
-  }, null, this);
+  }, null, this, [[8, 17]]);
 };
 /* Content Libraries */
 

package/dist/src/client/ContentManagement.js

@@ -502,18 +502,26 @@ exports.CreateContentLibrary = function _callee4(_ref6) {
 
         case 19:
           if (!tenantId) {
+            _context5.next = 24;
+            break;
+          }
+
+          if (this.utils.ValidHash(tenantId)) {
             _context5.next = 22;
             break;
           }
 
-          _context5.next = 22;
+          throw Error("Invalid tenant ID: ".concat(tenantId));
+
+        case 22:
+          _context5.next = 24;
           return _regeneratorRuntime.awrap(this.CallContractMethod({
             contractAddress: contractAddress,
             methodName: "putMeta",
             methodArgs: ["_tenantId", tenantId]
           }));
 
-        case 22:
+        case 24:
           metadata = _objectSpread({}, metadata, {
             name: name,
             description: description,
@@ -527,15 +535,15 @@ exports.CreateContentLibrary = function _callee4(_ref6) {
           this.Log("Contract address: ".concat(contractAddress)); // Set library content object type and metadata on automatically created library object
 
           objectId = libraryId.replace("ilib", "iq__");
-          _context5.next = 29;
+          _context5.next = 31;
           return _regeneratorRuntime.awrap(this.EditContentObject({
             libraryId: libraryId,
             objectId: objectId
           }));
 
-        case 29:
+        case 31:
           editResponse = _context5.sent;
-          _context5.next = 32;
+          _context5.next = 34;
           return _regeneratorRuntime.awrap(this.ReplaceMetadata({
             libraryId: libraryId,
             objectId: objectId,
@@ -543,8 +551,8 @@ exports.CreateContentLibrary = function _callee4(_ref6) {
             writeToken: editResponse.write_token
           }));
 
-        case 32:
-          _context5.next = 34;
+        case 34:
+          _context5.next = 36;
           return _regeneratorRuntime.awrap(this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: objectId,
@@ -552,24 +560,24 @@ exports.CreateContentLibrary = function _callee4(_ref6) {
             commitMessage: "Create library"
           }));
 
-        case 34:
+        case 36:
           if (!image) {
-            _context5.next = 37;
+            _context5.next = 39;
             break;
           }
 
-          _context5.next = 37;
+          _context5.next = 39;
           return _regeneratorRuntime.awrap(this.SetContentLibraryImage({
             libraryId: libraryId,
             image: image,
             imageName: imageName
           }));
 
-        case 37:
+        case 39:
           this.Log("Library ".concat(libraryId, " created"));
           return _context5.abrupt("return", libraryId);
 
-        case 39:
+        case 41:
         case "end":
           return _context5.stop();
       }