@eluvio/elv-client-js 4.0.10 → 4.0.12

package/dist/src/AuthorizationClient.js

@@ -127,11 +127,11 @@ 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;
               }
@@ -199,7 +199,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 partHash: partHash,
                 encryption: encryption,
                 update: update,
-                noAuth: noAuth
+                makeAccessRequest: makeAccessRequest
               });
             case 27:
               authorizationToken = _context2.sent;
@@ -228,11 +228,11 @@ 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;
               }
@@ -286,7 +286,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 qspace_id: this.contentSpaceId,
                 addr: Utils.FormatAddress(this.client.signer && this.client.signer.address || "")
               };
-              if (!update) {
+              if (!(update || makeAccessRequest)) {
                 _context3.next = 29;
                 break;
               }
@@ -297,8 +297,7 @@ var AuthorizationClient = /*#__PURE__*/function () {
                 versionHash: versionHash,
                 update: update,
                 publicKey: publicKey,
-                noCache: this.noCache,
-                noAuth: this.noAuth || noAuth
+                noCache: this.noCache
               });
             case 26:
               _yield$this$MakeAcces = _context3.sent;

package/dist/src/client/Files.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.10",
+  "version": "4.0.12",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",
@@ -30,15 +30,7 @@
     "publish": "npm publish --access public",
     "test": "node test/RunTests.js",
     "test-docs": "GENERATE_METHOD_LOGS=true node test/RunTests.js",
-    "test-utilities": "mocha --recursive utilities/tests/unit",
-    "jest": "jest",
-    "test-cov": "jest --coverage --coverageDirectory 'test/coverage'",
-    "test-build": "USE_BUILD=true jest"
-  },
-  "pre-commit": {
-    "run": [
-      "lint"
-    ]
+    "test-utilities": "mocha --recursive utilities/tests/unit"
   },
   "browser": {
     "fs": false
@@ -85,7 +77,6 @@
     "lodash": "^4.17.19",
     "lodash.isequal": "^4.5.0",
     "mime-types": "^2.1.24",
-    "multicodec": "^0.5.3",
     "multihashes": "^0.4.14",
     "node-fetch": "^2.6.7",
     "object-path": "^0.11.8",
@@ -96,7 +87,6 @@
     "ramda": "^0.27.1",
     "shell-escape": "^0.2.0",
     "sjcl": "^1.0.8",
-    "stream-browserify": "^3.0.0",
     "typedarray": "0.0.6",
     "unorm": "^1.5.0",
     "urijs": "^1.19.10",
@@ -116,21 +106,14 @@
     "copy-webpack-plugin": "^6.0.2",
     "eslint": "^5.15.0",
     "eslint-plugin-html": "^5.0.0",
-    "jest": "^24.9.0",
-    "jest-cli": "^24.9.0",
-    "jsdoc": "^3.6.10",
-    "minami": "^1.2.3",
+    "jsdoc": "^4.0.0",
     "mocha": "^8.2.1",
     "moment": "^2.27.0",
-    "pre-commit": "^1.2.2",
     "raw-loader": "^0.5.1",
     "shell-quote": "^1.7.2",
     "showdown": "^1.9.1",
     "simple-mock": "^0.8.0",
-    "solc": "^0.7.5",
-    "truffle": "^5.1.54",
-    "truffle-contract": "^3.0.7",
-    "truffle-test-utils": "^0.1.0",
+    "taffydb": "^2.7.3",
     "webpack": "^4.20.2",
     "webpack-bundle-analyzer": "^3.3.2",
     "webpack-cli": "^3.1.2",

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/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;