@eluvio/elv-client-js 3.2.44 → 4.0.0

package/dist/src/client/ContentAccess.js

@@ -19,6 +19,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  */
 var UrlJoin = require("url-join");
 
+var objectPath = require("object-path");
+
 var HttpClient = require("../HttpClient");
 
 var _require = require("../Validation"),
@@ -1154,6 +1156,7 @@ exports.ContentObjects = /*#__PURE__*/function () {
  * @param {string=} libraryId - ID of the library
  * @param {string=} objectId - ID of the object
  * @param {string=} versionHash - Version hash of the object -- if not specified, latest version is returned
+ * @param {string=} writeToken - Write token for an object draft -- if supplied, versionHash will be ignored
  *
  * @returns {Promise<Object>} - Description of content object
  */
@@ -1161,24 +1164,24 @@ exports.ContentObjects = /*#__PURE__*/function () {
 
 exports.ContentObject = /*#__PURE__*/function () {
   var _ref26 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(_ref25) {
-    var libraryId, objectId, versionHash, path;
+    var libraryId, objectId, versionHash, writeToken, path;
     return _regeneratorRuntime.wrap(function _callee15$(_context15) {
       while (1) {
         switch (_context15.prev = _context15.next) {
           case 0:
-            libraryId = _ref25.libraryId, objectId = _ref25.objectId, versionHash = _ref25.versionHash;
+            libraryId = _ref25.libraryId, objectId = _ref25.objectId, versionHash = _ref25.versionHash, writeToken = _ref25.writeToken;
             ValidateParameters({
               libraryId: libraryId,
               objectId: objectId,
               versionHash: versionHash
             });
-            this.Log("Retrieving content object: ".concat(libraryId || "", " ").concat(objectId || versionHash));
+            this.Log("Retrieving content object: ".concat(libraryId || "", " ").concat(writeToken || versionHash || objectId));
 
             if (versionHash) {
               objectId = this.utils.DecodeVersionHash(versionHash).objectId;
             }
 
-            path = UrlJoin("q", versionHash || objectId);
+            path = UrlJoin("q", writeToken || versionHash || objectId);
             _context15.t0 = this.utils;
             _context15.t1 = this.HttpClient;
             _context15.next = 9;
@@ -1782,7 +1785,7 @@ exports.MetadataAuth = /*#__PURE__*/function () {
 
 exports.ContentObjectMetadata = /*#__PURE__*/function () {
   var _ref41 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee24(_ref40) {
-    var libraryId, objectId, versionHash, writeToken, _ref40$metadataSubtre, metadataSubtree, _ref40$queryParams, queryParams, _ref40$select, select, _ref40$remove, remove, authorizationToken, _ref40$noAuth, noAuth, _ref40$resolveLinks, resolveLinks, _ref40$resolveInclude, resolveIncludeSource, _ref40$resolveIgnoreE, resolveIgnoreErrors, _ref40$linkDepthLimit, linkDepthLimit, _ref40$produceLinkUrl, produceLinkUrls, path, defaultAuthToken, authTokens, metadata;
+    var libraryId, objectId, versionHash, writeToken, _ref40$metadataSubtre, metadataSubtree, _ref40$queryParams, queryParams, _ref40$select, select, _ref40$remove, remove, authorizationToken, _ref40$noAuth, noAuth, _ref40$resolveLinks, resolveLinks, _ref40$resolveInclude, resolveIncludeSource, _ref40$resolveIgnoreE, resolveIgnoreErrors, _ref40$linkDepthLimit, linkDepthLimit, _ref40$produceLinkUrl, produceLinkUrls, path, defaultAuthToken, authTokens, metadata, errQwtoken;
 
     return _regeneratorRuntime.wrap(function _callee24$(_context24) {
       while (1) {
@@ -1841,7 +1844,7 @@ exports.ContentObjectMetadata = /*#__PURE__*/function () {
 
           case 14:
             metadata = _context24.sent;
-            _context24.next = 22;
+            _context24.next = 27;
             break;
 
           case 17:
@@ -1856,18 +1859,32 @@ exports.ContentObjectMetadata = /*#__PURE__*/function () {
             throw _context24.t0;
 
           case 21:
+            // For a 404 error, check if error was due to write token not found
+            errQwtoken = objectPath.get(_context24.t0.body, "errors[0].cause.cause.cause.qwtoken");
+
+            if (!errQwtoken) {
+              _context24.next = 26;
+              break;
+            }
+
+            throw _context24.t0;
+
+          case 26:
+            // For all other 404 errors (not just 'subtree not found'), suppress error and
+            // return an empty value. (there are function call chains that depend on this behavior,
+            //  e.g. CreateABRMezzanine -> CreateEncryptionConk -> ContentObjectMetadata)
             metadata = metadataSubtree === "/" ? {} : undefined;
 
-          case 22:
+          case 27:
             if (produceLinkUrls) {
-              _context24.next = 24;
+              _context24.next = 29;
               break;
             }
 
             return _context24.abrupt("return", metadata);
 
-          case 24:
-            _context24.next = 26;
+          case 29:
+            _context24.next = 31;
             return this.ProduceMetadataLinks({
               libraryId: libraryId,
               objectId: objectId,
@@ -1878,10 +1895,10 @@ exports.ContentObjectMetadata = /*#__PURE__*/function () {
               noAuth: noAuth
             });
 
-          case 26:
+          case 31:
             return _context24.abrupt("return", _context24.sent);
 
-          case 27:
+          case 32:
           case "end":
             return _context24.stop();
         }
@@ -4375,7 +4392,7 @@ exports.CreateEncryptionConk = /*#__PURE__*/function () {
             }
 
             _context46.next = 17;
-            return this.Crypto.DecryptCap(existingUserCap, this.signer.signingKey.privateKey);
+            return this.Crypto.DecryptCap(existingUserCap, this.signer._signingKey().privateKey);
 
           case 17:
             this.encryptionConks[objectId] = _context46.sent;
@@ -4397,7 +4414,7 @@ exports.CreateEncryptionConk = /*#__PURE__*/function () {
             _context46.t3 = writeToken;
             _context46.t4 = capKey;
             _context46.next = 30;
-            return this.Crypto.EncryptConk(this.encryptionConks[objectId], this.signer.signingKey.publicKey);
+            return this.Crypto.EncryptConk(this.encryptionConks[objectId], this.signer._signingKey().publicKey);
 
           case 30:
             _context46.t5 = _context46.sent;
@@ -4614,7 +4631,7 @@ exports.EncryptionConk = /*#__PURE__*/function () {
             }
 
             _context47.next = 29;
-            return this.Crypto.DecryptCap(existingUserCap, this.signer.signingKey.privateKey);
+            return this.Crypto.DecryptCap(existingUserCap, this.signer._signingKey().privateKey);
 
           case 29:
             this.encryptionConks[objectId] = _context47.sent;

package/dist/src/client/ContentManagement.js

@@ -1219,7 +1219,7 @@ exports.CopyContentObject = /*#__PURE__*/function () {
             }
 
             _context13.next = 20;
-            return this.Crypto.DecryptCap(metadata[userCapKey], this.signer.signingKey.privateKey);
+            return this.Crypto.DecryptCap(metadata[userCapKey], this.signer._signingKey().privateKey);
 
           case 20:
             userConkKey = _context13.sent;
@@ -1230,7 +1230,7 @@ exports.CopyContentObject = /*#__PURE__*/function () {
             _context13.t3 = writeToken;
             _context13.t4 = userCapKey;
             _context13.next = 29;
-            return this.Crypto.EncryptConk(userConkKey, this.signer.signingKey.publicKey);
+            return this.Crypto.EncryptConk(userConkKey, this.signer._signingKey().publicKey);
 
           case 29:
             _context13.t5 = _context13.sent;
@@ -1357,7 +1357,7 @@ exports.CreateNonOwnerCap = /*#__PURE__*/function () {
 
           case 7:
             _context14.next = 9;
-            return this.Crypto.DecryptCap(userCapValue, this.signer.signingKey.privateKey);
+            return this.Crypto.DecryptCap(userCapValue, this.signer._signingKey().privateKey);
 
           case 9:
             userConk = _context14.sent;
@@ -1429,13 +1429,13 @@ exports.CreateNonOwnerCap = /*#__PURE__*/function () {
  * meta: New metadata for the object - will be merged into existing metadata if specified
  * type: New type for the object - Object ID, version hash or name of type
  *
- * @returns {Promise<object>} - Response containing the object ID and write token of the draft
+ * @returns {Promise<object>} - Response containing the object ID and write token of the draft, as well as URL of node handling the draft
  */
 
 
 exports.EditContentObject = /*#__PURE__*/function () {
   var _ref28 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(_ref27) {
-    var libraryId, objectId, _ref27$options, options, path, editResponse;
+    var libraryId, objectId, _ref27$options, options, path, rawEditResponse, actualUrl, nodeUrl, editResponse;
 
     return _regeneratorRuntime.wrap(function _callee15$(_context15) {
       while (1) {
@@ -1505,38 +1505,47 @@ exports.EditContentObject = /*#__PURE__*/function () {
 
           case 23:
             path = UrlJoin("qid", objectId);
-            _context15.t0 = this.utils;
-            _context15.t1 = this.HttpClient;
-            _context15.next = 28;
+            _context15.t0 = this.HttpClient;
+            _context15.next = 27;
             return this.authClient.AuthorizationHeader({
               libraryId: libraryId,
               objectId: objectId,
               update: true
             });
 
-          case 28:
-            _context15.t2 = _context15.sent;
-            _context15.t3 = path;
-            _context15.t4 = options;
-            _context15.t5 = {
-              headers: _context15.t2,
+          case 27:
+            _context15.t1 = _context15.sent;
+            _context15.t2 = path;
+            _context15.t3 = options;
+            _context15.t4 = {
+              headers: _context15.t1,
               method: "POST",
-              path: _context15.t3,
-              body: _context15.t4
+              path: _context15.t2,
+              body: _context15.t3
             };
-            _context15.t6 = _context15.t1.Request.call(_context15.t1, _context15.t5);
-            _context15.next = 35;
-            return _context15.t0.ResponseToJson.call(_context15.t0, _context15.t6);
+            _context15.next = 33;
+            return _context15.t0.Request.call(_context15.t0, _context15.t4);
 
-          case 35:
+          case 33:
+            rawEditResponse = _context15.sent;
+            actualUrl = new URL(rawEditResponse.url);
+            actualUrl.pathname = "";
+            actualUrl.search = "";
+            actualUrl.hash = "";
+            nodeUrl = actualUrl.href;
+            _context15.next = 41;
+            return this.utils.ResponseToJson(rawEditResponse);
+
+          case 41:
             editResponse = _context15.sent;
             // Record the node used in creating this write token
-            this.HttpClient.RecordWriteToken(editResponse.write_token);
+            this.HttpClient.RecordWriteToken(editResponse.write_token, nodeUrl);
             editResponse.writeToken = editResponse.write_token;
             editResponse.objectId = editResponse.id;
+            editResponse.nodeUrl = nodeUrl;
             return _context15.abrupt("return", editResponse);
 
-          case 40:
+          case 47:
           case "end":
             return _context15.stop();
         }
@@ -2086,7 +2095,7 @@ exports.PublishContentVersion = /*#__PURE__*/function () {
                       events = _context21.sent;
                       confirmEvent = events.find(function (blockEvents) {
                         return blockEvents.find(function (event) {
-                          return objectHash === (event && event.values && event.values.objectHash);
+                          return objectHash === (event && event.args && event.args.objectHash);
                         });
                       });
 
@@ -2639,7 +2648,7 @@ exports.UpdateContentObjectGraph = /*#__PURE__*/function () {
 /**
  * Generate a signed link token.
  *
- * @methodGroup Access Requests
+ * @methodGroup Links
  * @namedParams
  * @param {string=} containerId - ID of the container object
  * @param {string=} versionHash - Version hash of the object

package/dist/src/client/Contracts.js

@@ -813,7 +813,7 @@ exports.ExtractValueFromEvent = function (_ref25) {
     eventName: eventName,
     eventValue: eventValue
   });
-  return eventLog ? eventLog.values[eventValue] : undefined;
+  return eventLog ? eventLog.args[eventValue] : undefined;
 };
 
 exports.FormatBlockNumbers = /*#__PURE__*/function () {