@eluvio/elv-client-js 4.0.9 → 4.0.11

package/dist/src/AuthorizationClient.js

@@ -152,13 +152,13 @@ var AuthorizationClient = /*#__PURE__*/function () {
     key: "AuthorizationToken",
     value: function () {
       var _AuthorizationToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref3) {
-        var libraryId, objectId, versionHash, partHash, encryption, audienceData, context, _ref3$update, update, _ref3$channelAuth, channelAuth, oauthToken, _ref3$noCache, noCache, _ref3$noAuth, noAuth, isWalletRequest, initialNoCache, authorizationToken;
+        var libraryId, objectId, versionHash, partHash, encryption, audienceData, context, _ref3$update, update, _ref3$makeAccessReque, makeAccessRequest, _ref3$channelAuth, channelAuth, oauthToken, _ref3$noCache, noCache, _ref3$noAuth, noAuth, isWalletRequest, initialNoCache, authorizationToken;
 
         return _regeneratorRuntime.wrap(function _callee2$(_context2) {
           while (1) {
             switch (_context2.prev = _context2.next) {
               case 0:
-                libraryId = _ref3.libraryId, objectId = _ref3.objectId, versionHash = _ref3.versionHash, partHash = _ref3.partHash, encryption = _ref3.encryption, audienceData = _ref3.audienceData, context = _ref3.context, _ref3$update = _ref3.update, update = _ref3$update === void 0 ? false : _ref3$update, _ref3$channelAuth = _ref3.channelAuth, channelAuth = _ref3$channelAuth === void 0 ? false : _ref3$channelAuth, oauthToken = _ref3.oauthToken, _ref3$noCache = _ref3.noCache, noCache = _ref3$noCache === void 0 ? false : _ref3$noCache, _ref3$noAuth = _ref3.noAuth, noAuth = _ref3$noAuth === void 0 ? false : _ref3$noAuth;
+                libraryId = _ref3.libraryId, objectId = _ref3.objectId, versionHash = _ref3.versionHash, partHash = _ref3.partHash, encryption = _ref3.encryption, audienceData = _ref3.audienceData, context = _ref3.context, _ref3$update = _ref3.update, update = _ref3$update === void 0 ? false : _ref3$update, _ref3$makeAccessReque = _ref3.makeAccessRequest, makeAccessRequest = _ref3$makeAccessReque === void 0 ? false : _ref3$makeAccessReque, _ref3$channelAuth = _ref3.channelAuth, channelAuth = _ref3$channelAuth === void 0 ? false : _ref3$channelAuth, oauthToken = _ref3.oauthToken, _ref3$noCache = _ref3.noCache, noCache = _ref3$noCache === void 0 ? false : _ref3$noCache, _ref3$noAuth = _ref3.noAuth, noAuth = _ref3$noAuth === void 0 ? false : _ref3$noAuth;
 
                 if (versionHash) {
                   objectId = this.client.utils.DecodeVersionHash(versionHash).objectId;
@@ -243,7 +243,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
                   partHash: partHash,
                   encryption: encryption,
                   update: update,
-                  noAuth: noAuth
+                  makeAccessRequest: makeAccessRequest
                 });
 
               case 27:
@@ -280,13 +280,13 @@ var AuthorizationClient = /*#__PURE__*/function () {
     key: "GenerateAuthorizationToken",
     value: function () {
       var _GenerateAuthorizationToken = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref4) {
-        var libraryId, objectId, versionHash, partHash, encryption, _ref4$update, update, _ref4$noAuth, noAuth, publicKey, owner, ownerCapKey, ownerCap, cap, token, _yield$this$MakeAcces, transactionHash, signature, multiSig;
+        var libraryId, objectId, versionHash, partHash, encryption, _ref4$update, update, _ref4$makeAccessReque, makeAccessRequest, publicKey, owner, ownerCapKey, ownerCap, cap, token, _yield$this$MakeAcces, transactionHash, signature, multiSig;
 
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
           while (1) {
             switch (_context3.prev = _context3.next) {
               case 0:
-                libraryId = _ref4.libraryId, objectId = _ref4.objectId, versionHash = _ref4.versionHash, partHash = _ref4.partHash, encryption = _ref4.encryption, _ref4$update = _ref4.update, update = _ref4$update === void 0 ? false : _ref4$update, _ref4$noAuth = _ref4.noAuth, noAuth = _ref4$noAuth === void 0 ? false : _ref4$noAuth;
+                libraryId = _ref4.libraryId, objectId = _ref4.objectId, versionHash = _ref4.versionHash, partHash = _ref4.partHash, encryption = _ref4.encryption, _ref4$update = _ref4.update, update = _ref4$update === void 0 ? false : _ref4$update, _ref4$makeAccessReque = _ref4.makeAccessRequest, makeAccessRequest = _ref4$makeAccessReque === void 0 ? false : _ref4$makeAccessReque;
 
                 if (versionHash) {
                   objectId = Utils.DecodeVersionHash(versionHash).objectId;
@@ -353,7 +353,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
                   addr: Utils.FormatAddress(this.client.signer && this.client.signer.address || "")
                 };
 
-                if (!update) {
+                if (!(update || makeAccessRequest)) {
                   _context3.next = 29;
                   break;
                 }
@@ -365,8 +365,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
                   versionHash: versionHash,
                   update: update,
                   publicKey: publicKey,
-                  noCache: this.noCache,
-                  noAuth: this.noAuth || noAuth
+                  noCache: this.noCache
                 });
 
               case 26:

package/dist/src/client/ContentManagement.js

@@ -343,7 +343,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, createResponse, uploadResponse;
+    var name, _ref6$metadata, metadata, bitcode, _yield$this$authClien, contractAddress, objectId, path, rawCreateResponse, nodeUrl, createResponse, uploadResponse;
 
     return _regeneratorRuntime.wrap(function _callee4$(_context4) {
       while (1) {
@@ -373,32 +373,36 @@ exports.CreateContentType = /*#__PURE__*/function () {
             this.Log("Created type: ".concat(contractAddress, " ").concat(objectId));
             /* Create object, upload bitcode and finalize */
 
-            _context4.t0 = this.utils;
-            _context4.t1 = this.HttpClient;
-            _context4.next = 17;
+            _context4.t0 = this.HttpClient;
+            _context4.next = 16;
             return this.authClient.AuthorizationHeader({
               libraryId: this.contentSpaceLibraryId,
               objectId: objectId,
               update: true
             });
 
-          case 17:
-            _context4.t2 = _context4.sent;
-            _context4.t3 = path;
-            _context4.t4 = {
-              headers: _context4.t2,
+          case 16:
+            _context4.t1 = _context4.sent;
+            _context4.t2 = path;
+            _context4.t3 = {
+              headers: _context4.t1,
               method: "POST",
-              path: _context4.t3
+              path: _context4.t2
             };
-            _context4.t5 = _context4.t1.Request.call(_context4.t1, _context4.t4);
-            _context4.next = 23;
-            return _context4.t0.ResponseToJson.call(_context4.t0, _context4.t5);
+            _context4.next = 21;
+            return _context4.t0.Request.call(_context4.t0, _context4.t3);
 
-          case 23:
+          case 21:
+            rawCreateResponse = _context4.sent;
+            nodeUrl = new URL(rawCreateResponse.url).origin;
+            _context4.next = 25;
+            return this.utils.ResponseToJson(rawCreateResponse);
+
+          case 25:
             createResponse = _context4.sent;
             // Record the node used in creating this write token
-            this.HttpClient.RecordWriteToken(createResponse.write_token);
-            _context4.next = 27;
+            this.HttpClient.RecordWriteToken(createResponse.write_token, nodeUrl);
+            _context4.next = 29;
             return this.ReplaceMetadata({
               libraryId: this.contentSpaceLibraryId,
               objectId: objectId,
@@ -406,13 +410,13 @@ exports.CreateContentType = /*#__PURE__*/function () {
               metadata: metadata
             });
 
-          case 27:
+          case 29:
             if (!bitcode) {
-              _context4.next = 33;
+              _context4.next = 35;
               break;
             }
 
-            _context4.next = 30;
+            _context4.next = 32;
             return this.UploadPart({
               libraryId: this.contentSpaceLibraryId,
               objectId: objectId,
@@ -421,9 +425,9 @@ exports.CreateContentType = /*#__PURE__*/function () {
               encrypted: false
             });
 
-          case 30:
+          case 32:
             uploadResponse = _context4.sent;
-            _context4.next = 33;
+            _context4.next = 35;
             return this.ReplaceMetadata({
               libraryId: this.contentSpaceLibraryId,
               objectId: objectId,
@@ -432,8 +436,8 @@ exports.CreateContentType = /*#__PURE__*/function () {
               metadata: uploadResponse.part.hash
             });
 
-          case 33:
-            _context4.next = 35;
+          case 35:
+            _context4.next = 37;
             return this.FinalizeContentObject({
               libraryId: this.contentSpaceLibraryId,
               objectId: objectId,
@@ -441,10 +445,10 @@ exports.CreateContentType = /*#__PURE__*/function () {
               commitMessage: "Create content type"
             });
 
-          case 35:
+          case 37:
             return _context4.abrupt("return", objectId);
 
-          case 36:
+          case 38:
           case "end":
             return _context4.stop();
         }
@@ -960,7 +964,7 @@ exports.RemoveLibraryContentType = /*#__PURE__*/function () {
 
 exports.CreateContentObject = /*#__PURE__*/function () {
   var _ref21 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref20) {
-    var libraryId, objectId, _ref20$options, options, typeId, type, currentAccountAddress, canContribute, _yield$this$authClien3, contractAddress, path, createResponse;
+    var libraryId, objectId, _ref20$options, options, typeId, type, currentAccountAddress, canContribute, _yield$this$authClien3, contractAddress, path, rawCreateResponse, nodeUrl, createResponse;
 
     return _regeneratorRuntime.wrap(function _callee11$(_context11) {
       while (1) {
@@ -1108,38 +1112,43 @@ exports.CreateContentObject = /*#__PURE__*/function () {
 
           case 55:
             path = UrlJoin("qid", objectId);
-            _context11.t4 = this.utils;
-            _context11.t5 = this.HttpClient;
-            _context11.next = 60;
+            _context11.t4 = this.HttpClient;
+            _context11.next = 59;
             return this.authClient.AuthorizationHeader({
               libraryId: libraryId,
               objectId: objectId,
               update: true
             });
 
-          case 60:
-            _context11.t6 = _context11.sent;
-            _context11.t7 = path;
-            _context11.t8 = options;
-            _context11.t9 = {
-              headers: _context11.t6,
+          case 59:
+            _context11.t5 = _context11.sent;
+            _context11.t6 = path;
+            _context11.t7 = options;
+            _context11.t8 = {
+              headers: _context11.t5,
               method: "POST",
-              path: _context11.t7,
-              body: _context11.t8
+              path: _context11.t6,
+              body: _context11.t7
             };
-            _context11.t10 = _context11.t5.Request.call(_context11.t5, _context11.t9);
-            _context11.next = 67;
-            return _context11.t4.ResponseToJson.call(_context11.t4, _context11.t10);
+            _context11.next = 65;
+            return _context11.t4.Request.call(_context11.t4, _context11.t8);
+
+          case 65:
+            rawCreateResponse = _context11.sent;
+            nodeUrl = new URL(rawCreateResponse.url).origin;
+            _context11.next = 69;
+            return this.utils.ResponseToJson(rawCreateResponse);
 
-          case 67:
+          case 69:
             createResponse = _context11.sent;
             // Record the node used in creating this write token
-            this.HttpClient.RecordWriteToken(createResponse.write_token);
+            this.HttpClient.RecordWriteToken(createResponse.write_token, nodeUrl);
             createResponse.writeToken = createResponse.write_token;
             createResponse.objectId = createResponse.id;
+            createResponse.nodeUrl = nodeUrl;
             return _context11.abrupt("return", createResponse);
 
-          case 72:
+          case 75:
           case "end":
             return _context11.stop();
         }
@@ -1435,7 +1444,7 @@ exports.CreateNonOwnerCap = /*#__PURE__*/function () {
 
 exports.EditContentObject = /*#__PURE__*/function () {
   var _ref28 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee15(_ref27) {
-    var libraryId, objectId, _ref27$options, options, path, rawEditResponse, actualUrl, nodeUrl, editResponse;
+    var libraryId, objectId, _ref27$options, options, path, rawEditResponse, nodeUrl, editResponse;
 
     return _regeneratorRuntime.wrap(function _callee15$(_context15) {
       while (1) {
@@ -1528,15 +1537,11 @@ exports.EditContentObject = /*#__PURE__*/function () {
 
           case 33:
             rawEditResponse = _context15.sent;
-            actualUrl = new URL(rawEditResponse.url);
-            actualUrl.pathname = "";
-            actualUrl.search = "";
-            actualUrl.hash = "";
-            nodeUrl = actualUrl.href;
-            _context15.next = 41;
+            nodeUrl = new URL(rawEditResponse.url).origin;
+            _context15.next = 37;
             return this.utils.ResponseToJson(rawEditResponse);
 
-          case 41:
+          case 37:
             editResponse = _context15.sent;
             // Record the node used in creating this write token
             this.HttpClient.RecordWriteToken(editResponse.write_token, nodeUrl);
@@ -1545,7 +1550,7 @@ exports.EditContentObject = /*#__PURE__*/function () {
             editResponse.nodeUrl = nodeUrl;
             return _context15.abrupt("return", editResponse);
 
-          case 47:
+          case 43:
           case "end":
             return _context15.stop();
         }

package/dist/src/client/Files.js

@@ -1560,7 +1560,8 @@ exports.DownloadPart = /*#__PURE__*/function () {
               libraryId: libraryId,
               objectId: objectId,
               versionHash: versionHash,
-              encryption: encryption
+              encryption: encryption,
+              makeAccessRequest: true
             });
 
           case 9:

package/package.json

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

package/src/AuthorizationClient.js

@@ -116,6 +116,7 @@ class AuthorizationClient {
     audienceData,
     context,
     update=false,
+    makeAccessRequest=false,
     channelAuth=false,
     oauthToken,
     noCache=false,
@@ -171,7 +172,7 @@ class AuthorizationClient {
           partHash,
           encryption,
           update,
-          noAuth
+          makeAccessRequest
         });
       }
 
@@ -183,7 +184,7 @@ class AuthorizationClient {
     }
   }
 
-  async GenerateAuthorizationToken({libraryId, objectId, versionHash, partHash, encryption, update=false, noAuth=false}) {
+  async GenerateAuthorizationToken({libraryId, objectId, versionHash, partHash, encryption, update=false, makeAccessRequest=false}) {
     if(versionHash) { objectId = Utils.DecodeVersionHash(versionHash).objectId; }
 
     // Generate AFGH public key if encryption is specified
@@ -204,15 +205,14 @@ class AuthorizationClient {
       addr: Utils.FormatAddress(((this.client.signer && this.client.signer.address) || ""))
     };
 
-    if(update) {
+    if(update || makeAccessRequest) {
       const { transactionHash } =  await this.MakeAccessRequest({
         libraryId,
         objectId,
         versionHash,
         update,
         publicKey,
-        noCache: this.noCache,
-        noAuth: this.noAuth || noAuth
+        noCache: this.noCache
       });
 
       if(transactionHash) {

package/src/client/ContentManagement.js

@@ -174,20 +174,20 @@ exports.CreateContentType = async function({name, metadata={}, bitcode}) {
   this.Log(`Created type: ${contractAddress} ${objectId}`);
 
   /* Create object, upload bitcode and finalize */
-  const createResponse = await this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({
-        libraryId: this.contentSpaceLibraryId,
-        objectId,
-        update: true
-      }),
-      method: "POST",
-      path: path
-    })
-  );
+  const rawCreateResponse = await this.HttpClient.Request({
+    headers: await this.authClient.AuthorizationHeader({
+      libraryId: this.contentSpaceLibraryId,
+      objectId,
+      update: true
+    }),
+    method: "POST",
+    path: path
+  });
+  const nodeUrl = (new URL(rawCreateResponse.url)).origin;
+  const createResponse = await this.utils.ResponseToJson(rawCreateResponse);
 
   // Record the node used in creating this write token
-  this.HttpClient.RecordWriteToken(createResponse.write_token);
+  this.HttpClient.RecordWriteToken(createResponse.write_token, nodeUrl);
 
   await this.ReplaceMetadata({
     libraryId: this.contentSpaceLibraryId,
@@ -605,20 +605,21 @@ exports.CreateContentObject = async function({libraryId, objectId, options={}})
 
   const path = UrlJoin("qid", objectId);
 
-  let createResponse = await this.utils.ResponseToJson(
-    this.HttpClient.Request({
-      headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
-      method: "POST",
-      path: path,
-      body: options
-    })
-  );
+  const rawCreateResponse = await this.HttpClient.Request({
+    headers: await this.authClient.AuthorizationHeader({libraryId, objectId, update: true}),
+    method: "POST",
+    path: path,
+    body: options
+  });
+  const nodeUrl = (new URL(rawCreateResponse.url)).origin;
+  const createResponse = await this.utils.ResponseToJson(rawCreateResponse);
 
   // Record the node used in creating this write token
-  this.HttpClient.RecordWriteToken(createResponse.write_token);
+  this.HttpClient.RecordWriteToken(createResponse.write_token, nodeUrl);
 
   createResponse.writeToken = createResponse.write_token;
   createResponse.objectId = createResponse.id;
+  createResponse.nodeUrl = nodeUrl;
 
   return createResponse;
 };
@@ -780,14 +781,8 @@ exports.EditContentObject = async function({libraryId, objectId, options={}}) {
     path: path,
     body: options
   });
-
-  const actualUrl = new URL(rawEditResponse.url);
-  actualUrl.pathname = "";
-  actualUrl.search = "";
-  actualUrl.hash = "";
-  const nodeUrl = actualUrl.href;
-
-  let editResponse = await this.utils.ResponseToJson(rawEditResponse);
+  const nodeUrl = (new URL(rawEditResponse.url)).origin;
+  const editResponse = await this.utils.ResponseToJson(rawEditResponse);
 
   // Record the node used in creating this write token
   this.HttpClient.RecordWriteToken(editResponse.write_token, nodeUrl);

package/src/client/Files.js

@@ -809,7 +809,7 @@ exports.DownloadPart = async function({
   const encryption = encrypted ? "cgck" : undefined;
   const path = UrlJoin("q", writeToken || versionHash || objectId, "data", partHash);
 
-  let headers = await this.authClient.AuthorizationHeader({libraryId, objectId, versionHash, encryption});
+  let headers = await this.authClient.AuthorizationHeader({libraryId, objectId, versionHash, encryption, makeAccessRequest: true});
 
   const bytesTotal = (await this.ContentPart({libraryId, objectId, versionHash, partHash})).part.size;
 

package/utilities/ListAccessGroups.js

@@ -0,0 +1,34 @@
+// List all access gropus visible to the current private key
+
+const Utility = require("./lib/Utility");
+
+const Client = require("./lib/concerns/Client");
+const Logger = require("./lib/concerns/Logger");
+
+class ListAccessGroups extends Utility {
+  blueprint() {
+    return {
+      concerns: [Logger, Client]
+    };
+  }
+
+  async body() {
+    const logger = this.logger;
+    const libList = await this.concerns.Library.list();
+    logger.data("libraries", libList);
+
+    logger.logList(libList);
+    if(libList.length === 0) logger.warn("No visible libraries found using supplied private key.");
+  }
+
+  header() {
+    return "Get list of access groups";
+  }
+
+}
+
+if(require.main === module) {
+  Utility.cmdLineInvoke(ListAccessGroups);
+} else {
+  module.exports = ListAccessGroups;
+}