@eluvio/elv-client-js 4.0.77 → 4.0.79

package/dist/src/client/ContentManagement.js

@@ -282,7 +282,7 @@ exports.SetPermission = /*#__PURE__*/function () {
  */
 exports.CreateContentType = /*#__PURE__*/function () {
   var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref6) {
-    var name, _ref6$metadata, metadata, bitcode, _yield$this$authClien, contractAddress, objectId, path, rawCreateResponse, nodeUrl, createResponse, uploadResponse;
+    var name, _ref6$metadata, metadata, bitcode, _yield$this$authClien, contractAddress, objectId, path, rawCreateResponse, nodeUrl, createResponse, uploadResponse, tenantContractId;
     return _regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
@@ -377,8 +377,24 @@ exports.CreateContentType = /*#__PURE__*/function () {
             commitMessage: "Create content type"
           });
         case 37:
+          _context4.next = 39;
+          return this.userProfileClient.TenantContractId();
+        case 39:
+          tenantContractId = _context4.sent;
+          if (!tenantContractId) {
+            _context4.next = 44;
+            break;
+          }
+          _context4.next = 43;
+          return this.SetTenantContractId({
+            contractAddress: contractAddress,
+            tenantContractId: tenantContractId
+          });
+        case 43:
+          this.Log("tenant_contract_id set for ".concat(objectId));
+        case 44:
           return _context4.abrupt("return", objectId);
-        case 38:
+        case 45:
         case "end":
           return _context4.stop();
       }
@@ -414,11 +430,11 @@ exports.CreateContentType = /*#__PURE__*/function () {
  */
 exports.CreateContentLibrary = /*#__PURE__*/function () {
   var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref8) {
-    var name, description, image, imageName, _ref8$metadata, metadata, kmsId, tenantId, _yield$this$authClien2, contractAddress, libraryId, objectId, editResponse;
+    var name, description, image, imageName, _ref8$metadata, metadata, kmsId, tenantContractId, _yield$this$authClien2, contractAddress, libraryId, objectId, editResponse;
     return _regeneratorRuntime.wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          name = _ref8.name, description = _ref8.description, image = _ref8.image, imageName = _ref8.imageName, _ref8$metadata = _ref8.metadata, metadata = _ref8$metadata === void 0 ? {} : _ref8$metadata, kmsId = _ref8.kmsId, tenantId = _ref8.tenantId;
+          name = _ref8.name, description = _ref8.description, image = _ref8.image, imageName = _ref8.imageName, _ref8$metadata = _ref8.metadata, metadata = _ref8$metadata === void 0 ? {} : _ref8$metadata, kmsId = _ref8.kmsId, tenantContractId = _ref8.tenantContractId;
           if (kmsId) {
             _context5.next = 9;
             break;
@@ -441,32 +457,6 @@ exports.CreateContentLibrary = /*#__PURE__*/function () {
         case 13:
           _yield$this$authClien2 = _context5.sent;
           contractAddress = _yield$this$authClien2.contractAddress;
-          if (tenantId) {
-            _context5.next = 19;
-            break;
-          }
-          _context5.next = 18;
-          return this.userProfileClient.TenantId();
-        case 18:
-          tenantId = _context5.sent;
-        case 19:
-          if (!tenantId) {
-            _context5.next = 24;
-            break;
-          }
-          if (this.utils.ValidHash(tenantId)) {
-            _context5.next = 22;
-            break;
-          }
-          throw Error("Invalid tenant ID: ".concat(tenantId));
-        case 22:
-          _context5.next = 24;
-          return this.CallContractMethod({
-            contractAddress: contractAddress,
-            methodName: "putMeta",
-            methodArgs: ["_tenantId", tenantId]
-          });
-        case 24:
           metadata = _objectSpread(_objectSpread({}, metadata), {}, {
             name: name,
             description: description,
@@ -481,43 +471,64 @@ exports.CreateContentLibrary = /*#__PURE__*/function () {
 
           // Set library content object type and metadata on automatically created library object
           objectId = libraryId.replace("ilib", "iq__");
-          _context5.next = 31;
+          _context5.next = 22;
           return this.EditContentObject({
             libraryId: libraryId,
             objectId: objectId
           });
-        case 31:
+        case 22:
           editResponse = _context5.sent;
-          _context5.next = 34;
+          _context5.next = 25;
           return this.ReplaceMetadata({
             libraryId: libraryId,
             objectId: objectId,
             metadata: metadata,
             writeToken: editResponse.write_token
           });
-        case 34:
-          _context5.next = 36;
+        case 25:
+          _context5.next = 27;
           return this.FinalizeContentObject({
             libraryId: libraryId,
             objectId: objectId,
             writeToken: editResponse.write_token,
             commitMessage: "Create library"
           });
-        case 36:
+        case 27:
           if (!image) {
-            _context5.next = 39;
+            _context5.next = 30;
             break;
           }
-          _context5.next = 39;
+          _context5.next = 30;
           return this.SetContentLibraryImage({
             libraryId: libraryId,
             image: image,
             imageName: imageName
           });
-        case 39:
+        case 30:
+          if (tenantContractId) {
+            _context5.next = 34;
+            break;
+          }
+          _context5.next = 33;
+          return this.userProfileClient.TenantContractId();
+        case 33:
+          tenantContractId = _context5.sent;
+        case 34:
+          if (!tenantContractId) {
+            _context5.next = 38;
+            break;
+          }
+          _context5.next = 37;
+          return this.SetTenantContractId({
+            contractAddress: contractAddress,
+            tenantContractId: tenantContractId
+          });
+        case 37:
+          this.Log("tenant_contract_id set for ".concat(contractAddress));
+        case 38:
           this.Log("Library ".concat(libraryId, " created"));
           return _context5.abrupt("return", libraryId);
-        case 41:
+        case 40:
         case "end":
           return _context5.stop();
       }
@@ -2540,4 +2551,53 @@ exports.SetAuthPolicy = /*#__PURE__*/function () {
   return function (_x33) {
     return _ref63.apply(this, arguments);
   };
+}();
+
+/**
+ * Delete the specified write token
+ *
+ * @methodGroup Content Objects
+ *
+ * @namedParams
+ * @param {string} writeToken - Write token to delete
+ * @param {string} libraryId - ID of the library
+ */
+exports.DeleteWriteToken = /*#__PURE__*/function () {
+  var _ref65 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee35(_ref64) {
+    var writeToken, libraryId, path, authorizationHeader;
+    return _regeneratorRuntime.wrap(function _callee35$(_context36) {
+      while (1) switch (_context36.prev = _context36.next) {
+        case 0:
+          writeToken = _ref64.writeToken, libraryId = _ref64.libraryId;
+          ValidateWriteToken(writeToken);
+          ValidateLibrary(libraryId);
+          path = UrlJoin("qlibs", libraryId, "q", writeToken);
+          _context36.next = 6;
+          return this.authClient.AuthorizationHeader({
+            libraryId: libraryId,
+            update: true
+          });
+        case 6:
+          authorizationHeader = _context36.sent;
+          _context36.next = 9;
+          return this.HttpClient.Request({
+            headers: authorizationHeader,
+            method: "DELETE",
+            path: path,
+            allowFailover: false
+          });
+        case 9:
+          _context36.next = 11;
+          return this.HttpClient.ClearWriteToken({
+            writeToken: writeToken
+          });
+        case 11:
+        case "end":
+          return _context36.stop();
+      }
+    }, _callee35, this);
+  }));
+  return function (_x34) {
+    return _ref65.apply(this, arguments);
+  };
 }();

package/dist/src/client/Contracts.js

@@ -16,7 +16,10 @@ var Ethers = require("ethers");
 var _require = require("../Validation"),
   ValidateAddress = _require.ValidateAddress,
   ValidateParameters = _require.ValidateParameters,
-  ValidatePresence = _require.ValidatePresence;
+  ValidatePresence = _require.ValidatePresence,
+  ValidateObject = _require.ValidateObject,
+  ValidateVersion = _require.ValidateVersion;
+var Utils = require("../Utils");
 
 /**
  * Return the name of the contract, as specified in the contracts "version" string
@@ -515,13 +518,16 @@ exports.ReplaceContractMetadata = /*#__PURE__*/function () {
           contractAddress = _ref20.contractAddress, metadataKey = _ref20.metadataKey, metadata = _ref20.metadata;
           ValidatePresence("contractAddress", contractAddress);
           ValidatePresence("metadataKey", metadataKey);
-          _context10.next = 5;
+          if (_typeof(metadata) === "object") {
+            metadata = JSON.stringify(metadata);
+          }
+          _context10.next = 6;
           return this.CallContractMethodAndWait({
             contractAddress: contractAddress,
             methodName: "putMeta",
-            methodArgs: [metadataKey, JSON.stringify(metadata)]
+            methodArgs: [metadataKey, metadata]
           });
-        case 5:
+        case 6:
         case "end":
           return _context10.stop();
       }
@@ -928,4 +934,262 @@ exports.SendFunds = /*#__PURE__*/function () {
   return function (_x15) {
     return _ref36.apply(this, arguments);
   };
+}();
+
+/**
+ * Retrieve the ID of the tenant contract for the specified object
+ *
+ * @methodGroup Tenant
+ * @namedParams
+ * @param {string=} contractAddress - The address of the object
+ * @param {string=} objectId - The ID of the object
+ * @param {string=} versionHash - A version hash of the object
+ *
+ * @returns {Promise<string|undefined>}
+ */
+exports.TenantContractId = /*#__PURE__*/function () {
+  var _ref38 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(_ref37) {
+    var contractAddress, objectId, versionHash, hasGetMetaMethod, tenantContractId, libraryId;
+    return _regeneratorRuntime.wrap(function _callee18$(_context18) {
+      while (1) switch (_context18.prev = _context18.next) {
+        case 0:
+          contractAddress = _ref37.contractAddress, objectId = _ref37.objectId, versionHash = _ref37.versionHash;
+          if (!contractAddress) {
+            _context18.next = 6;
+            break;
+          }
+          ValidateAddress(contractAddress);
+          objectId = Utils.AddressToObjectId(contractAddress);
+          _context18.next = 18;
+          break;
+        case 6:
+          if (!versionHash) {
+            _context18.next = 12;
+            break;
+          }
+          ValidateVersion(versionHash);
+          objectId = this.utils.DecodeVersionHash(versionHash).objectId;
+          contractAddress = Utils.HashToAddress(objectId);
+          _context18.next = 18;
+          break;
+        case 12:
+          if (!objectId) {
+            _context18.next = 17;
+            break;
+          }
+          ValidateObject(objectId);
+          contractAddress = Utils.HashToAddress(objectId);
+          _context18.next = 18;
+          break;
+        case 17:
+          throw Error("contractAddress or objectId or versionHash not specified");
+        case 18:
+          _context18.next = 20;
+          return this.authClient.ContractHasMethod({
+            contractAddress: contractAddress,
+            methodName: "getMeta"
+          });
+        case 20:
+          hasGetMetaMethod = _context18.sent;
+          if (!hasGetMetaMethod) {
+            _context18.next = 27;
+            break;
+          }
+          _context18.next = 24;
+          return this.ContractMetadata({
+            contractAddress: contractAddress,
+            metadataKey: "_ELV_TENANT_ID"
+          });
+        case 24:
+          tenantContractId = _context18.sent;
+          if (!(tenantContractId !== "")) {
+            _context18.next = 27;
+            break;
+          }
+          return _context18.abrupt("return", tenantContractId);
+        case 27:
+          _context18.next = 29;
+          return this.ContentObjectLibraryId({
+            objectId: objectId
+          });
+        case 29:
+          libraryId = _context18.sent;
+          _context18.next = 32;
+          return this.ContentObjectMetadata({
+            libraryId: libraryId,
+            objectId: objectId,
+            metadataSubtree: "tenantContractId"
+          });
+        case 32:
+          return _context18.abrupt("return", _context18.sent);
+        case 33:
+        case "end":
+          return _context18.stop();
+      }
+    }, _callee18, this);
+  }));
+  return function (_x16) {
+    return _ref38.apply(this, arguments);
+  };
+}();
+
+/**
+ * Set the tenant contract ID for the specified object
+ *
+ * @methodGroup Tenant
+ * @namedParams
+ * @param {string=} contractAddress - The address of the object
+ * @param {string=} objectId - The ID of the object
+ * @param {string=} versionHash - A version hash of the object
+ * @param {string} tenantContractId - The tenant contract ID to set
+ *
+ * @returns {Promise<{tenantId: (undefined|string), tenantContractId}>}
+ */
+exports.SetTenantContractId = /*#__PURE__*/function () {
+  var _ref40 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee19(_ref39) {
+    var contractAddress, objectId, versionHash, tenantContractId, tenantAddress, version, tenantAdminGroupAddress, hasPutMetaMethod, libraryId, editRequest;
+    return _regeneratorRuntime.wrap(function _callee19$(_context19) {
+      while (1) switch (_context19.prev = _context19.next) {
+        case 0:
+          contractAddress = _ref39.contractAddress, objectId = _ref39.objectId, versionHash = _ref39.versionHash, tenantContractId = _ref39.tenantContractId;
+          if (!contractAddress) {
+            _context19.next = 6;
+            break;
+          }
+          ValidateAddress(contractAddress);
+          objectId = Utils.AddressToObjectId(contractAddress);
+          _context19.next = 18;
+          break;
+        case 6:
+          if (!versionHash) {
+            _context19.next = 12;
+            break;
+          }
+          ValidateVersion(versionHash);
+          objectId = this.utils.DecodeVersionHash(versionHash).objectId;
+          contractAddress = Utils.HashToAddress(objectId);
+          _context19.next = 18;
+          break;
+        case 12:
+          if (!objectId) {
+            _context19.next = 17;
+            break;
+          }
+          ValidateObject(objectId);
+          contractAddress = Utils.HashToAddress(objectId);
+          _context19.next = 18;
+          break;
+        case 17:
+          throw Error("contractAddress or objectId or versionHash not specified");
+        case 18:
+          ValidateObject(tenantContractId);
+          if (!(tenantContractId && (!tenantContractId.startsWith("iten") || !Utils.ValidHash(tenantContractId)))) {
+            _context19.next = 21;
+            break;
+          }
+          throw Error("Invalid tenant ID: ".concat(tenantContractId));
+        case 21:
+          tenantAddress = Utils.HashToAddress(tenantContractId);
+          _context19.next = 24;
+          return this.authClient.AccessType(tenantContractId);
+        case 24:
+          version = _context19.sent;
+          if (!(version !== this.authClient.ACCESS_TYPES.TENANT)) {
+            _context19.next = 27;
+            break;
+          }
+          throw Error("Invalid tenant ID: " + tenantContractId);
+        case 27:
+          _context19.next = 29;
+          return this.CallContractMethod({
+            contractAddress: tenantAddress,
+            methodName: "groupsMapping",
+            methodArgs: ["tenant_admin", 0],
+            formatArguments: true
+          });
+        case 29:
+          tenantAdminGroupAddress = _context19.sent;
+          _context19.next = 32;
+          return this.authClient.ContractHasMethod({
+            contractAddress: contractAddress,
+            methodName: "putMeta"
+          });
+        case 32:
+          hasPutMetaMethod = _context19.sent;
+          if (!hasPutMetaMethod) {
+            _context19.next = 44;
+            break;
+          }
+          _context19.next = 36;
+          return this.ReplaceContractMetadata({
+            contractAddress: contractAddress,
+            metadataKey: "_ELV_TENANT_ID",
+            metadata: tenantContractId
+          });
+        case 36:
+          if (!tenantAdminGroupAddress) {
+            _context19.next = 41;
+            break;
+          }
+          _context19.next = 39;
+          return this.ReplaceContractMetadata({
+            contractAddress: contractAddress,
+            metadataKey: "_tenantId",
+            metadata: "iten".concat(Utils.AddressToHash(tenantAdminGroupAddress))
+          });
+        case 39:
+          _context19.next = 42;
+          break;
+        case 41:
+          // eslint-disable-next-line no-console
+          console.warn("No tenant ID associated with current tenant.");
+        case 42:
+          _context19.next = 54;
+          break;
+        case 44:
+          _context19.next = 46;
+          return this.ContentObjectLibraryId({
+            objectId: objectId
+          });
+        case 46:
+          libraryId = _context19.sent;
+          _context19.next = 49;
+          return this.EditContentObject({
+            libraryId: libraryId,
+            objectId: objectId
+          });
+        case 49:
+          editRequest = _context19.sent;
+          _context19.next = 52;
+          return this.MergeMetadata({
+            libraryId: libraryId,
+            objectId: objectId,
+            writeToken: editRequest.write_token,
+            metadata: {
+              tenantContractId: tenantContractId,
+              tenantId: !tenantAdminGroupAddress ? undefined : "iten".concat(Utils.AddressToHash(tenantAdminGroupAddress))
+            }
+          });
+        case 52:
+          _context19.next = 54;
+          return this.FinalizeContentObject({
+            libraryId: libraryId,
+            objectId: objectId,
+            writeToken: editRequest.write_token,
+            commitMessage: "set tenant_contract_id"
+          });
+        case 54:
+          return _context19.abrupt("return", {
+            tenantContractId: tenantContractId,
+            tenantId: !tenantAdminGroupAddress ? undefined : "iten".concat(Utils.AddressToHash(tenantAdminGroupAddress))
+          });
+        case 55:
+        case "end":
+          return _context19.stop();
+      }
+    }, _callee19, this);
+  }));
+  return function (_x17) {
+    return _ref40.apply(this, arguments);
+  };
 }();