@eluvio/elv-client-js 4.0.26 → 4.0.27

package/dist/src/ElvClient.js

@@ -1429,43 +1429,66 @@ var ElvClient = /*#__PURE__*/function () {
               }
               _context20.prev = 3;
               method = message.calledMethod;
+              if (!(message.module === "walletClient")) {
+                _context20.next = 15;
+                break;
+              }
+              if (this.walletClient) {
+                _context20.next = 8;
+                break;
+              }
+              throw Error("Wallet client not set");
+            case 8:
+              if (!this.walletClient.ForbiddenMethods().includes(method)) {
+                _context20.next = 10;
+                break;
+              }
+              throw Error("Invalid user profile method: " + method);
+            case 10:
+              _context20.next = 12;
+              return this.walletClient[method](message.args);
+            case 12:
+              methodResults = _context20.sent;
+              _context20.next = 28;
+              break;
+            case 15:
               if (!(message.module === "userProfileClient")) {
-                _context20.next = 13;
+                _context20.next = 23;
                 break;
               }
               if (this.userProfileClient.FrameAllowedMethods().includes(method)) {
-                _context20.next = 8;
+                _context20.next = 18;
                 break;
               }
               throw Error("Invalid user profile method: " + method);
-            case 8:
-              _context20.next = 10;
+            case 18:
+              _context20.next = 20;
               return this.userProfileClient[method](message.args);
-            case 10:
+            case 20:
               methodResults = _context20.sent;
-              _context20.next = 18;
+              _context20.next = 28;
               break;
-            case 13:
+            case 23:
               if (this.FrameAllowedMethods().includes(method)) {
-                _context20.next = 15;
+                _context20.next = 25;
                 break;
               }
               throw Error("Invalid method: " + method);
-            case 15:
-              _context20.next = 17;
+            case 25:
+              _context20.next = 27;
               return this[method](message.args);
-            case 17:
+            case 27:
               methodResults = _context20.sent;
-            case 18:
+            case 28:
               Respond(this.utils.MakeClonable({
                 type: "ElvFrameResponse",
                 requestId: message.requestId,
                 response: methodResults
               }));
-              _context20.next = 27;
+              _context20.next = 37;
               break;
-            case 21:
-              _context20.prev = 21;
+            case 31:
+              _context20.prev = 31;
               _context20.t0 = _context20["catch"](3);
               // eslint-disable-next-line no-console
               this.Log("Frame Message Error:\n        Method: ".concat(message.calledMethod, "\n        Arguments: ").concat(JSON.stringify(message.args, null, 2), "\n        Error: ").concat(_typeof(_context20.t0) === "object" ? JSON.stringify(_context20.t0, null, 2) : _context20.t0), true);
@@ -1478,11 +1501,11 @@ var ElvClient = /*#__PURE__*/function () {
                 requestId: message.requestId,
                 error: responseError
               }));
-            case 27:
+            case 37:
             case "end":
               return _context20.stop();
           }
-        }, _callee20, this, [[3, 21]]);
+        }, _callee20, this, [[3, 31]]);
       }));
       function CallFromFrameMessage(_x16, _x17) {
         return _CallFromFrameMessage.apply(this, arguments);

package/dist/src/FrameClient.js

@@ -14,6 +14,8 @@ var permissionLevels = require("./client/ContentAccess").permissionLevels;
 var _require = require("./LogMessage"),
   LogMessage = _require.LogMessage;
 var Crypto = require("./Crypto");
+var _require2 = require("./walletClient/index"),
+  ElvWalletClient = _require2.ElvWalletClient;
 var FrameClient = /*#__PURE__*/function () {
   "use strict";
 
@@ -157,6 +159,57 @@ var FrameClient = /*#__PURE__*/function () {
     } finally {
       _iterator2.f();
     }
+    this.walletClient = {};
+    var forbiddenMethods = ElvWalletClient.ForbiddenMethods();
+    var _iterator3 = _createForOfIteratorHelper(Object.getOwnPropertyNames(ElvWalletClient.prototype)),
+      _step3;
+    try {
+      var _loop3 = function _loop3() {
+        var methodName = _step3.value;
+        if (forbiddenMethods.includes(methodName)) {
+          return "continue";
+        }
+        _this.walletClient[methodName] = /*#__PURE__*/function () {
+          var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(args) {
+            var callback;
+            return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+              while (1) switch (_context3.prev = _context3.next) {
+                case 0:
+                  callback = args && args.callback;
+                  if (callback) {
+                    delete args.callback;
+                  }
+                  _context3.next = 4;
+                  return _this.SendMessage({
+                    options: {
+                      module: "walletClient",
+                      calledMethod: methodName,
+                      args: _this.utils.MakeClonable(args)
+                    },
+                    callback: callback
+                  });
+                case 4:
+                  return _context3.abrupt("return", _context3.sent);
+                case 5:
+                case "end":
+                  return _context3.stop();
+              }
+            }, _callee3);
+          }));
+          return function (_x3) {
+            return _ref4.apply(this, arguments);
+          };
+        }();
+      };
+      for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+        var _ret = _loop3();
+        if (_ret === "continue") continue;
+      }
+    } catch (err) {
+      _iterator3.e(err);
+    } finally {
+      _iterator3.f();
+    }
   }
 
   /**
@@ -176,13 +229,13 @@ var FrameClient = /*#__PURE__*/function () {
   }, {
     key: "PassRequest",
     value: function () {
-      var _PassRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref4) {
+      var _PassRequest = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref5) {
         var request, Respond, response, error, callback;
-        return _regeneratorRuntime.wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
-              request = _ref4.request, Respond = _ref4.Respond;
-              _context3.prev = 1;
+              request = _ref5.request, Respond = _ref5.Respond;
+              _context4.prev = 1;
               if (request.callbackId) {
                 callback = function callback(result) {
                   return Respond({
@@ -192,21 +245,21 @@ var FrameClient = /*#__PURE__*/function () {
                   });
                 };
               }
-              _context3.next = 5;
+              _context4.next = 5;
               return this.SendMessage({
                 options: request,
                 callback: callback
               });
             case 5:
-              response = _context3.sent;
-              _context3.next = 11;
+              response = _context4.sent;
+              _context4.next = 11;
               break;
             case 8:
-              _context3.prev = 8;
-              _context3.t0 = _context3["catch"](1);
-              error = _context3.t0;
+              _context4.prev = 8;
+              _context4.t0 = _context4["catch"](1);
+              error = _context4.t0;
             case 11:
-              return _context3.abrupt("return", {
+              return _context4.abrupt("return", {
                 type: "ElvFrameResponse",
                 requestId: request.requestId,
                 response: response,
@@ -214,11 +267,11 @@ var FrameClient = /*#__PURE__*/function () {
               });
             case 12:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
-        }, _callee3, this, [[1, 8]]);
+        }, _callee4, this, [[1, 8]]);
       }));
-      function PassRequest(_x3) {
+      function PassRequest(_x4) {
         return _PassRequest.apply(this, arguments);
       }
       return PassRequest;
@@ -226,12 +279,12 @@ var FrameClient = /*#__PURE__*/function () {
   }, {
     key: "SendMessage",
     value: function () {
-      var _SendMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(_ref5) {
-        var _ref5$options, options, callback, _ref5$noResponse, noResponse, requestId, callbackId, operation, isFileOperation, timeout;
-        return _regeneratorRuntime.wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _SendMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(_ref6) {
+        var _ref6$options, options, callback, _ref6$noResponse, noResponse, requestId, callbackId, operation, isFileOperation, timeout;
+        return _regeneratorRuntime.wrap(function _callee5$(_context5) {
+          while (1) switch (_context5.prev = _context5.next) {
             case 0:
-              _ref5$options = _ref5.options, options = _ref5$options === void 0 ? {} : _ref5$options, callback = _ref5.callback, _ref5$noResponse = _ref5.noResponse, noResponse = _ref5$noResponse === void 0 ? false : _ref5$noResponse;
+              _ref6$options = _ref6.options, options = _ref6$options === void 0 ? {} : _ref6$options, callback = _ref6.callback, _ref6$noResponse = _ref6.noResponse, noResponse = _ref6$noResponse === void 0 ? false : _ref6$noResponse;
               requestId = Id.next();
               if (callback) {
                 callbackId = Id.next();
@@ -244,10 +297,10 @@ var FrameClient = /*#__PURE__*/function () {
 
               // No timeout for prompted methods
               if (!noResponse) {
-                _context4.next = 6;
+                _context5.next = 6;
                 break;
               }
-              return _context4.abrupt("return");
+              return _context5.abrupt("return");
             case 6:
               operation = options.calledMethod || options.operation;
               isFileOperation = FrameClient.FileMethods().includes(options.calledMethod);
@@ -257,17 +310,17 @@ var FrameClient = /*#__PURE__*/function () {
               } else if (options.args && options.args.fcTimeout) {
                 timeout = options.args.fcTimeout;
               }
-              _context4.next = 12;
+              _context5.next = 12;
               return this.AwaitMessage(requestId, timeout, callback, callbackId, operation);
             case 12:
-              return _context4.abrupt("return", _context4.sent);
+              return _context5.abrupt("return", _context5.sent);
             case 13:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function SendMessage(_x4) {
+      function SendMessage(_x5) {
         return _SendMessage.apply(this, arguments);
       }
       return SendMessage;
@@ -275,11 +328,11 @@ var FrameClient = /*#__PURE__*/function () {
   }, {
     key: "AwaitMessage",
     value: function () {
-      var _AwaitMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(requestId, timeout, callback, callbackId, operation) {
-        return _regeneratorRuntime.wrap(function _callee6$(_context6) {
-          while (1) switch (_context6.prev = _context6.next) {
+      var _AwaitMessage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee7(requestId, timeout, callback, callbackId, operation) {
+        return _regeneratorRuntime.wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
             case 0:
-              _context6.next = 2;
+              _context7.next = 2;
               return new Promise(function (resolve, reject) {
                 var methodListener;
 
@@ -323,18 +376,18 @@ var FrameClient = /*#__PURE__*/function () {
 
                 // Set up final method response listener
                 methodListener = /*#__PURE__*/function () {
-                  var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(event) {
+                  var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6(event) {
                     var message;
-                    return _regeneratorRuntime.wrap(function _callee5$(_context5) {
-                      while (1) switch (_context5.prev = _context5.next) {
+                    return _regeneratorRuntime.wrap(function _callee6$(_context6) {
+                      while (1) switch (_context6.prev = _context6.next) {
                         case 0:
-                          _context5.prev = 0;
+                          _context6.prev = 0;
                           message = event.data;
                           if (!(message.type !== "ElvFrameResponse" || message.requestId !== requestId)) {
-                            _context5.next = 4;
+                            _context6.next = 4;
                             break;
                           }
-                          return _context5.abrupt("return");
+                          return _context6.abrupt("return");
                         case 4:
                           clearTimeout(timeoutId);
                           window.removeEventListener("message", methodListener);
@@ -346,25 +399,25 @@ var FrameClient = /*#__PURE__*/function () {
                           } else {
                             resolve(message.response);
                           }
-                          _context5.next = 16;
+                          _context6.next = 16;
                           break;
                         case 10:
-                          _context5.prev = 10;
-                          _context5.t0 = _context5["catch"](0);
+                          _context6.prev = 10;
+                          _context6.t0 = _context6["catch"](0);
                           clearTimeout(timeoutId);
                           window.removeEventListener("message", methodListener);
                           if (callbackListener) {
                             window.removeEventListener("message", callbackListener);
                           }
-                          reject(_context5.t0);
+                          reject(_context6.t0);
                         case 16:
                         case "end":
-                          return _context5.stop();
+                          return _context6.stop();
                       }
-                    }, _callee5, null, [[0, 10]]);
+                    }, _callee6, null, [[0, 10]]);
                   }));
-                  return function methodListener(_x10) {
-                    return _ref6.apply(this, arguments);
+                  return function methodListener(_x11) {
+                    return _ref7.apply(this, arguments);
                   };
                 }();
 
@@ -373,14 +426,14 @@ var FrameClient = /*#__PURE__*/function () {
                 window.addEventListener("message", methodListener);
               });
             case 2:
-              return _context6.abrupt("return", _context6.sent);
+              return _context7.abrupt("return", _context7.sent);
             case 3:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
-        }, _callee6);
+        }, _callee7);
       }));
-      function AwaitMessage(_x5, _x6, _x7, _x8, _x9) {
+      function AwaitMessage(_x6, _x7, _x8, _x9, _x10) {
         return _AwaitMessage.apply(this, arguments);
       }
       return AwaitMessage;
@@ -427,7 +480,7 @@ var FrameClient = /*#__PURE__*/function () {
   }]);
   return FrameClient;
 }();
-var _require2 = require("./client/Files"),
-  UploadFiles = _require2.UploadFiles;
+var _require3 = require("./client/Files"),
+  UploadFiles = _require3.UploadFiles;
 FrameClient.prototype.UploadFiles = UploadFiles;
 exports.FrameClient = FrameClient;

package/dist/src/walletClient/index.js

@@ -75,6 +75,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
     this.cachedMarketplaces = {};
     this.cachedCSS = {};
     this.utils = client.utils;
+    this.ForbiddenMethods = ElvWalletClient.ForbiddenMethods;
   }
   _createClass(ElvWalletClient, [{
     key: "Log",
@@ -94,23 +95,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
       }
     }
 
-    /**
-     * Initialize the wallet client.
-     *
-     * Specify tenantSlug and marketplaceSlug to automatically associate this tenant with a particular marketplace.
-     *
-     *
-     * @methodGroup Initialization
-     * @namedParams
-     * @param {string} appId - A string identifying your app. This is used for namespacing user profile data.
-     * @param {string} network=main - Name of the Fabric network to use (`main`, `demo`)
-     * @param {string} mode=production - Environment to use (`production`, `staging`)
-     * @param {Object=} marketplaceParams - Marketplace parameters
-     * @param {boolean=} storeAuthToken=true - If specified, auth tokens will be stored in localstorage (if available)
-     * @param {Object=} client - Existing instance of ElvClient to use instead of initializing a new one
-     *
-     * @returns {Promise<ElvWalletClient>}
-     */
+    // Methods forbidden from usage by FrameClient
   }, {
     key: "CanSign",
     value: /* Login and authorization */
@@ -1527,14 +1512,37 @@ var ElvWalletClient = /*#__PURE__*/function () {
       return MintingStatus;
     }()
   }], [{
+    key: "ForbiddenMethods",
+    value: function ForbiddenMethods() {
+      return ["constructor", "Authenticate", "AuthenticateOAuth", "AuthenticateExternalWallet", "AuthToken", "ClientAuthToken", "Initialize", "Log", "LogIn", "LogOut", "PersonalSign", "SetAuthorization", "SignMetamask"];
+    }
+
+    /**
+     * Initialize the wallet client.
+     *
+     * Specify tenantSlug and marketplaceSlug to automatically associate this tenant with a particular marketplace.
+     *
+     *
+     * @methodGroup Initialization
+     * @namedParams
+     * @param {string} appId - A string identifying your app. This is used for namespacing user profile data.
+     * @param {string} network=main - Name of the Fabric network to use (`main`, `demo`)
+     * @param {string} mode=production - Environment to use (`production`, `staging`)
+     * @param {Object=} marketplaceParams - Marketplace parameters
+     * @param {boolean=} storeAuthToken=true - If specified, auth tokens will be stored in localstorage (if available)
+     * @param {Object=} client - Existing instance of ElvClient to use instead of initializing a new one
+     *
+     * @returns {Promise<ElvWalletClient>}
+     */
+  }, {
     key: "Initialize",
     value: function () {
       var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(_ref18) {
-        var client, _ref18$appId, appId, _ref18$network, network, _ref18$mode, mode, localization, marketplaceParams, previewMarketplaceId, _ref18$storeAuthToken, storeAuthToken, _ref19, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, previewMarketplaceHash, walletClient, url, savedToken;
+        var client, _ref18$appId, appId, _ref18$network, network, _ref18$mode, mode, localization, marketplaceParams, previewMarketplaceId, _ref18$storeAuthToken, storeAuthToken, _ref18$skipMarketplac, skipMarketplaceLoad, _ref19, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, previewMarketplaceHash, walletClient, url, savedToken;
         return _regeneratorRuntime.wrap(function _callee18$(_context18) {
           while (1) switch (_context18.prev = _context18.next) {
             case 0:
-              client = _ref18.client, _ref18$appId = _ref18.appId, appId = _ref18$appId === void 0 ? "general" : _ref18$appId, _ref18$network = _ref18.network, network = _ref18$network === void 0 ? "main" : _ref18$network, _ref18$mode = _ref18.mode, mode = _ref18$mode === void 0 ? "production" : _ref18$mode, localization = _ref18.localization, marketplaceParams = _ref18.marketplaceParams, previewMarketplaceId = _ref18.previewMarketplaceId, _ref18$storeAuthToken = _ref18.storeAuthToken, storeAuthToken = _ref18$storeAuthToken === void 0 ? true : _ref18$storeAuthToken;
+              client = _ref18.client, _ref18$appId = _ref18.appId, appId = _ref18$appId === void 0 ? "general" : _ref18$appId, _ref18$network = _ref18.network, network = _ref18$network === void 0 ? "main" : _ref18$network, _ref18$mode = _ref18.mode, mode = _ref18$mode === void 0 ? "production" : _ref18$mode, localization = _ref18.localization, marketplaceParams = _ref18.marketplaceParams, previewMarketplaceId = _ref18.previewMarketplaceId, _ref18$storeAuthToken = _ref18.storeAuthToken, storeAuthToken = _ref18$storeAuthToken === void 0 ? true : _ref18$storeAuthToken, _ref18$skipMarketplac = _ref18.skipMarketplaceLoad, skipMarketplaceLoad = _ref18$skipMarketplac === void 0 ? false : _ref18$skipMarketplac;
               _ref19 = marketplaceParams || {}, tenantSlug = _ref19.tenantSlug, marketplaceSlug = _ref19.marketplaceSlug, marketplaceId = _ref19.marketplaceId, marketplaceHash = _ref19.marketplaceHash;
               if (Configuration[network]) {
                 _context18.next = 6;
@@ -1628,11 +1636,15 @@ var ElvWalletClient = /*#__PURE__*/function () {
               _context18.prev = 35;
               _context18.t0 = _context18["catch"](28);
             case 37:
-              _context18.next = 39;
+              if (skipMarketplaceLoad) {
+                _context18.next = 40;
+                break;
+              }
+              _context18.next = 40;
               return walletClient.LoadAvailableMarketplaces();
-            case 39:
-              return _context18.abrupt("return", walletClient);
             case 40:
+              return _context18.abrupt("return", walletClient);
+            case 41:
             case "end":
               return _context18.stop();
           }

package/package.json

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

package/src/ElvClient.js

@@ -1134,7 +1134,17 @@ class ElvClient {
       const method = message.calledMethod;
 
       let methodResults;
-      if(message.module === "userProfileClient") {
+      if(message.module === "walletClient") {
+        if(!this.walletClient) {
+          throw Error("Wallet client not set");
+        }
+
+        if(this.walletClient.ForbiddenMethods().includes(method)) {
+          throw Error("Invalid user profile method: " + method);
+        }
+
+        methodResults = await this.walletClient[method](message.args);
+      } else if(message.module === "userProfileClient") {
         if(!this.userProfileClient.FrameAllowedMethods().includes(method)) {
           throw Error("Invalid user profile method: " + method);
         }

package/src/FrameClient.js

@@ -3,6 +3,7 @@ const Utils = require("./Utils");
 const permissionLevels = require("./client/ContentAccess").permissionLevels;
 const {LogMessage} = require("./LogMessage");
 const Crypto = require("./Crypto");
+const { ElvWalletClient } = require("./walletClient/index");
 
 class FrameClient {
   Log(message, error = false) {
@@ -88,6 +89,26 @@ class FrameClient {
         });
       };
     }
+
+    this.walletClient = {};
+    const forbiddenMethods = ElvWalletClient.ForbiddenMethods();
+    for(const methodName of Object.getOwnPropertyNames(ElvWalletClient.prototype)) {
+      if(forbiddenMethods.includes(methodName)) { continue; }
+
+      this.walletClient[methodName] = async (args) => {
+        let callback = args && args.callback;
+        if(callback) { delete args.callback; }
+
+        return await this.SendMessage({
+          options: {
+            module: "walletClient",
+            calledMethod: methodName,
+            args: this.utils.MakeClonable(args)
+          },
+          callback
+        });
+      };
+    }
   }
 
   /**

package/src/walletClient/index.js

@@ -58,6 +58,8 @@ class ElvWalletClient {
     this.cachedCSS = {};
 
     this.utils = client.utils;
+
+    this.ForbiddenMethods = ElvWalletClient.ForbiddenMethods;
   }
 
   Log(message, error=false, errorObject) {
@@ -75,6 +77,25 @@ class ElvWalletClient {
     }
   }
 
+  // Methods forbidden from usage by FrameClient
+  static ForbiddenMethods() {
+    return [
+      "constructor",
+      "Authenticate",
+      "AuthenticateOAuth",
+      "AuthenticateExternalWallet",
+      "AuthToken",
+      "ClientAuthToken",
+      "Initialize",
+      "Log",
+      "LogIn",
+      "LogOut",
+      "PersonalSign",
+      "SetAuthorization",
+      "SignMetamask"
+    ];
+  }
+
   /**
    * Initialize the wallet client.
    *
@@ -100,7 +121,8 @@ class ElvWalletClient {
     localization,
     marketplaceParams,
     previewMarketplaceId,
-    storeAuthToken=true
+    storeAuthToken=true,
+    skipMarketplaceLoad=false
   }) {
     let { tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash } = (marketplaceParams || {});
 
@@ -155,7 +177,9 @@ class ElvWalletClient {
       }
     }
 
-    await walletClient.LoadAvailableMarketplaces();
+    if(!skipMarketplaceLoad) {
+      await walletClient.LoadAvailableMarketplaces();
+    }
 
     return walletClient;
   }