@eluvio/elv-client-js 4.0.135 → 4.0.136

package/dist/src/walletClient/index.js

@@ -7,8 +7,8 @@ var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
 var _excluded = ["code", "address", "type", "authToken", "expiresAt"];
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); 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 = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var _require = require("../ElvClient"),
   ElvClient = _require.ElvClient;
 var Configuration = require("./Configuration");
@@ -79,7 +79,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     this.utils = client.utils;
     this.ForbiddenMethods = ElvWalletClient.ForbiddenMethods;
   }
-  _createClass(ElvWalletClient, [{
+  return _createClass(ElvWalletClient, [{
     key: "Log",
     value: function Log(message) {
       var error = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
@@ -136,7 +136,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "PersonalSign",
-    value: function () {
+    value: (function () {
       var _PersonalSign = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref2) {
         var message, parameters, url;
         return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -265,7 +265,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _PersonalSign.apply(this, arguments);
       }
       return PersonalSign;
-    }()
+    }())
   }, {
     key: "LogInURL",
     value: function () {
@@ -344,7 +344,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "LogIn",
-    value: function () {
+    value: (function () {
       var _LogIn = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(_ref5) {
         var _this = this;
         var _ref5$method, method, provider, _ref5$mode, mode, callbackUrl, marketplaceParams, _ref5$clearLogin, clearLogin, callback, loginUrl;
@@ -463,9 +463,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @methodGroup Login
      */
+    )
   }, {
     key: "LogOut",
-    value: function () {
+    value: (function () {
       var _LogOut = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee8() {
         return _regeneratorRuntime.wrap(function _callee8$(_context8) {
           while (1) switch (_context8.prev = _context8.next) {
@@ -508,7 +509,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _LogOut.apply(this, arguments);
       }
       return LogOut;
-    }()
+    }())
   }, {
     key: "TokenStatus",
     value: function () {
@@ -548,7 +549,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Authenticate",
-    value: function () {
+    value: (function () {
       var _Authenticate = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref7) {
         var token, decodedToken;
         return _regeneratorRuntime.wrap(function _callee10$(_context10) {
@@ -605,6 +606,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * @param {string=} email - Email address of the user. If not specified, this method will attempt to extract the email from the ID token.
      * @param {Array<string>=} signerURIs - (Only if using custom OAuth) - URIs corresponding to the key server(s) to use
      * @param {boolean=} shareEmail=false - Whether or not the user consents to sharing their email
+     * @param {number=} tokenDuration=24 - Token expiration duration, in hours
      *
      * @returns {Promise<Object>} - Returns an authorization tokens that can be used to initialize the client using <a href="#Authenticate">Authenticate</a>.
      * Save this token to avoid having to reauthenticate with OAuth. This token expires after 24 hours.
@@ -614,26 +616,26 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * - signingToken - Identical to `authToken`, but also includes the ability to perform arbitrary signatures with the custodial wallet. This token should be protected and should not be
      * shared with third parties.
      */
+    )
   }, {
     key: "AuthenticateOAuth",
-    value: function () {
+    value: (function () {
       var _AuthenticateOAuth = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11(_ref8) {
-        var idToken, tenantId, email, signerURIs, _ref8$shareEmail, shareEmail, _ref8$extraData, extraData, nonce, _ref8$createRemoteTok, createRemoteToken, _ref8$force, force, tokenDuration, fabricToken, expiresAt, tokenResponse, address, decodedToken;
+        var idToken, tenantId, email, signerURIs, _ref8$shareEmail, shareEmail, _ref8$extraData, extraData, nonce, _ref8$createRemoteTok, createRemoteToken, _ref8$force, force, _ref8$tokenDuration, tokenDuration, fabricToken, expiresAt, tokenResponse, address, decodedToken;
         return _regeneratorRuntime.wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              idToken = _ref8.idToken, tenantId = _ref8.tenantId, email = _ref8.email, signerURIs = _ref8.signerURIs, _ref8$shareEmail = _ref8.shareEmail, shareEmail = _ref8$shareEmail === void 0 ? false : _ref8$shareEmail, _ref8$extraData = _ref8.extraData, extraData = _ref8$extraData === void 0 ? {} : _ref8$extraData, nonce = _ref8.nonce, _ref8$createRemoteTok = _ref8.createRemoteToken, createRemoteToken = _ref8$createRemoteTok === void 0 ? true : _ref8$createRemoteTok, _ref8$force = _ref8.force, force = _ref8$force === void 0 ? false : _ref8$force;
-              tokenDuration = 24;
+              idToken = _ref8.idToken, tenantId = _ref8.tenantId, email = _ref8.email, signerURIs = _ref8.signerURIs, _ref8$shareEmail = _ref8.shareEmail, shareEmail = _ref8$shareEmail === void 0 ? false : _ref8$shareEmail, _ref8$extraData = _ref8.extraData, extraData = _ref8$extraData === void 0 ? {} : _ref8$extraData, nonce = _ref8.nonce, _ref8$createRemoteTok = _ref8.createRemoteToken, createRemoteToken = _ref8$createRemoteTok === void 0 ? true : _ref8$createRemoteTok, _ref8$force = _ref8.force, force = _ref8$force === void 0 ? false : _ref8$force, _ref8$tokenDuration = _ref8.tokenDuration, tokenDuration = _ref8$tokenDuration === void 0 ? 24 : _ref8$tokenDuration;
               if (!(!tenantId && this.selectedMarketplaceInfo)) {
-                _context11.next = 6;
+                _context11.next = 5;
                 break;
               }
-              _context11.next = 5;
+              _context11.next = 4;
               return this.AvailableMarketplaces();
-            case 5:
+            case 4:
               tenantId = this.selectedMarketplaceInfo.tenantId;
-            case 6:
-              _context11.next = 8;
+            case 5:
+              _context11.next = 7;
               return this.client.SetRemoteSigner({
                 idToken: idToken,
                 tenantId: tenantId,
@@ -643,54 +645,55 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 }),
                 unsignedPublicAuth: true
               });
-            case 8:
+            case 7:
               if (!(createRemoteToken && this.client.signer.remoteSigner)) {
-                _context11.next = 17;
+                _context11.next = 16;
                 break;
               }
-              expiresAt = Date.now() + 24 * 60 * 60 * 1000;
-              _context11.next = 12;
+              expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
+              _context11.next = 11;
               return this.client.signer.RetrieveCSAT({
                 email: email,
                 nonce: nonce,
                 tenantId: tenantId,
-                force: force
+                force: force,
+                duration: tokenDuration
               });
-            case 12:
+            case 11:
               tokenResponse = _context11.sent;
               fabricToken = tokenResponse.token;
               nonce = tokenResponse.nonce;
-              _context11.next = 21;
+              _context11.next = 20;
               break;
-            case 17:
+            case 16:
               expiresAt = Date.now() + tokenDuration * 60 * 60 * 1000;
-              _context11.next = 20;
+              _context11.next = 19;
               return this.client.CreateFabricToken({
-                duration: tokenDuration * 60 * 60 * 1000,
+                duration: parseInt(tokenDuration * 60 * 60 * 1000),
                 context: email ? {
                   usr: {
                     email: email
                   }
                 } : {}
               });
-            case 20:
+            case 19:
               fabricToken = _context11.sent;
-            case 21:
+            case 20:
               address = this.client.utils.FormatAddress(this.client.CurrentAccountAddress());
               if (email) {
-                _context11.next = 31;
+                _context11.next = 30;
                 break;
               }
-              _context11.prev = 23;
+              _context11.prev = 22;
               decodedToken = JSON.parse(this.utils.FromB64URL(idToken.split(".")[1]));
               email = decodedToken.email;
-              _context11.next = 31;
+              _context11.next = 30;
               break;
-            case 28:
-              _context11.prev = 28;
-              _context11.t0 = _context11["catch"](23);
+            case 27:
+              _context11.prev = 27;
+              _context11.t0 = _context11["catch"](22);
               throw Error("Failed to decode ID token");
-            case 31:
+            case 30:
               this.client.SetStaticToken({
                 token: fabricToken
               });
@@ -720,11 +723,11 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   nonce: nonce
                 })
               });
-            case 33:
+            case 32:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this, [[23, 28]]);
+        }, _callee11, this, [[22, 27]]);
       }));
       function AuthenticateOAuth(_x13) {
         return _AuthenticateOAuth.apply(this, arguments);
@@ -744,9 +747,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
      * @returns {Promise<string>} - Returns an authorization token that can be used to initialize the client using <a href="#Authenticate">Authenticate</a>.
      * Save this token to avoid having to reauthenticate. This token expires after 24 hours.
      */
+    )
   }, {
     key: "AuthenticateExternalWallet",
-    value: function () {
+    value: (function () {
       var _AuthenticateExternalWallet = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref9) {
         var _this2 = this;
         var address, _ref9$tokenDuration, tokenDuration, _ref9$walletName, walletName, Sign, expiresAt, fabricToken;
@@ -815,6 +819,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      *
      * @returns {string} - The client auth token
      */
+    )
   }, {
     key: "ClientAuthToken",
     value: function ClientAuthToken() {
@@ -1878,7 +1883,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
      */
   }, {
     key: "Initialize",
-    value: function () {
+    value: (function () {
       var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee25(_ref24) {
         var client, _ref24$appId, appId, _ref24$network, network, _ref24$mode, mode, localization, marketplaceParams, previewMarketplaceId, _ref24$storeAuthToken, storeAuthToken, _ref24$skipMarketplac, skipMarketplaceLoad, _ref25, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, previewMarketplaceHash, walletClient, url, savedToken;
         return _regeneratorRuntime.wrap(function _callee25$(_context25) {
@@ -1978,36 +1983,46 @@ var ElvWalletClient = /*#__PURE__*/function () {
               _context25.prev = 35;
               _context25.t0 = _context25["catch"](28);
             case 37:
-              _context25.next = 39;
+              _context25.prev = 37;
+              _context25.next = 40;
               return client.utils.ResponseToJson(client.MakeAuthServiceRequest({
                 path: "/as/mw/toplevel",
                 queryParams: {
                   env: mode
                 }
               }));
-            case 39:
+            case 40:
               walletClient.topLevelInfo = _context25.sent;
+              _context25.next = 47;
+              break;
+            case 43:
+              _context25.prev = 43;
+              _context25.t1 = _context25["catch"](37);
+              // eslint-disable-next-line no-console
+              console.error("Unable to load top level info:");
+              // eslint-disable-next-line no-console
+              console.error(_context25.t1);
+            case 47:
               if (skipMarketplaceLoad) {
-                _context25.next = 43;
+                _context25.next = 50;
                 break;
               }
-              _context25.next = 43;
+              _context25.next = 50;
               return walletClient.LoadAvailableMarketplaces();
-            case 43:
+            case 50:
               return _context25.abrupt("return", walletClient);
-            case 44:
+            case 51:
             case "end":
               return _context25.stop();
           }
-        }, _callee25, null, [[28, 35]]);
+        }, _callee25, null, [[28, 35], [37, 43]]);
       }));
       function Initialize(_x25) {
         return _Initialize.apply(this, arguments);
       }
       return Initialize;
-    }()
+    }())
   }]);
-  return ElvWalletClient;
 }();
 Object.assign(ElvWalletClient.prototype, require("./ClientMethods"));
 Object.assign(ElvWalletClient.prototype, require("./Profile"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eluvio/elv-client-js",
-  "version": "4.0.135",
+  "version": "4.0.136",
   "description": "Javascript client for the Eluvio Content Fabric",
   "main": "src/index.js",
   "author": "Kevin Talmadge",
@@ -54,7 +54,7 @@
   "dependencies": {
     "@babel/runtime": "^7.8.4",
     "@eluvio/crypto": "^1.1.1",
-    "@eluvio/elv-abr-profile": "^1.0.0",
+    "@eluvio/elv-abr-profile": "^1.0.2",
     "@sindresorhus/slugify": "^1.1.0",
     "babel-loader": "^8.0.6",
     "bignumber.js": "^8.0.2",

package/src/ElvClient.js

@@ -16,7 +16,8 @@ const {LogMessage} = require("./LogMessage");
 const Pako = require("pako");
 
 const {
-  ValidatePresence
+  ValidatePresence,
+  ValidateWriteToken
 } = require("./Validation");
 const UrlJoin = require("url-join");
 
@@ -618,10 +619,11 @@ class ElvClient {
    * @namedParams
    * @param {string=} matchEndpoint - Return node(s) matching the specified endpoint
    * @param {string=} matchNodeId - Return node(s) matching the specified node ID
+   * @param {string=} matchWriteToken - Return node(s) matching the specified write token
    *
    * @return {Promise<Array<Object>>} - A list of nodes in the space matching the parameters
    */
-  async SpaceNodes({matchEndpoint, matchNodeId}={}) {
+  async SpaceNodes({matchEndpoint, matchNodeId, matchWriteToken}={}) {
     let nodes;
     this.SetStaticToken();
 
@@ -665,6 +667,7 @@ class ElvClient {
       });
     } else if(matchNodeId) {
       this.SetStaticToken();
+
       let node = await this.utils.ResponseToJson(
         this.HttpClient.Request({
           path: UrlJoin("nodes", matchNodeId),
@@ -677,6 +680,24 @@ class ElvClient {
 
       this.ClearStaticToken();
       return [node];
+    } else if(matchWriteToken) {
+      this.SetStaticToken();
+
+      const {nodes} = await this.utils.ResponseToJson(
+        this.HttpClient.Request({
+          path: UrlJoin("nodes"),
+          method: "GET",
+          headers: {
+            Authorization: `Bearer ${this.staticToken}`
+          },
+          queryParams: {
+            token: matchWriteToken
+          }
+        })
+      );
+
+      this.ClearStaticToken();
+      return nodes;
     }
   }
 
@@ -694,7 +715,50 @@ class ElvClient {
     };
   }
 
-  WriteTokenNodeUrl({writeToken}) {
+  /**
+   * Return node url for a given write token via a network call
+   *
+   * @methodGroup Nodes
+   * @namedParams
+   * @param {string} writeToken - The write token to match to a node
+   *
+   * @returns {Promise<string>} - The node url for a write token
+   */
+  async WriteTokenNodeUrlNetwork({writeToken}) {
+    ValidateWriteToken(writeToken);
+
+    const nodes = await this.SpaceNodes({matchWriteToken: writeToken});
+
+    const nodeUrl = (
+      nodes &&
+      nodes[0] &&
+      nodes[0].services &&
+      nodes[0].services.fabric_api &&
+      nodes[0].services.fabric_api.urls &&
+      nodes[0].services.fabric_api.urls[0]
+    );
+
+    if(!nodeUrl) {
+      console.error(`No node url found for write token: ${writeToken}`);
+
+      return "";
+    }
+
+    return nodeUrl ? nodeUrl.toString() : undefined;
+  }
+
+  /**
+   * Return node url for a given write token via local lookup
+   *
+   * @methodGroup Nodes
+   * @namedParams
+   * @param {string} writeToken - The write token to match to a node
+   *
+   * @returns {string} - The node url for a write token
+   */
+  WriteTokenNodeUrlLocal({writeToken}) {
+    ValidateWriteToken(writeToken);
+
     const nodeUrl = this.HttpClient.draftURIs[writeToken];
 
     return nodeUrl ? nodeUrl.toString() : undefined;

package/src/FrameClient.js

@@ -509,7 +509,8 @@ class FrameClient {
       "UploadStatus",
       "UseRegion",
       "Visibility",
-      "WriteTokenNodeUrl"
+      "WriteTokenNodeUrlLocal",
+      "WriteTokenNodeUrlNetwork"
     ];
   }