@eluvio/elv-client-js 4.0.37 → 4.0.38

package/dist/src/walletClient/Configuration.js

@@ -27,7 +27,7 @@ var WalletConfiguration = {
       appUrl: "https://wallet.contentfabric.io"
     }
   },
-  __MARKETPLACE_ORDER: ["PREVIEW", "b63413a5-ce07-4848-b763-b4d97f4870ec", "masked-singer-brazil-marketplace", "eluvio-live-marketplace-globo-taf", "de228e92-ed45-4fe0-8e52-658cf366e962", "wwe-marketplace-main", "maskverse-marketplace", "dolly-marketplace", "eluvio-live-marketplace-sonark", "cirkay-marketplace", "eluvio-live-marketplace-fuudge", "oc-marketplace", "emp-marketplace", "microsoft", "indieflix-marketplace", "angels-airwaves-marketplace", "realcannonballrun-marketplace"]
+  __MARKETPLACE_ORDER: ["PREVIEW", "masked-singer-brazil-marketplace", "eluvio-live-marketplace-globo-taf", "de228e92-ed45-4fe0-8e52-658cf366e962", "wwe-marketplace-main", "maskverse-marketplace", "dolly-marketplace", "eluvio-live-marketplace-sonark", "cirkay-marketplace", "eluvio-live-marketplace-fuudge", "oc-marketplace", "emp-marketplace", "microsoft", "indieflix-marketplace", "angels-airwaves-marketplace", "realcannonballrun-marketplace"]
 };
 
 // No production environment on demo

package/dist/src/walletClient/index.js

@@ -808,27 +808,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
         return _SignMetamask.apply(this, arguments);
       }
       return SignMetamask;
-    }()
-  }, {
-    key: "FlowURL",
-    value: function FlowURL(_ref12) {
-      var _ref12$type = _ref12.type,
-        type = _ref12$type === void 0 ? "flow" : _ref12$type,
-        flow = _ref12.flow,
-        marketplaceId = _ref12.marketplaceId,
-        _ref12$parameters = _ref12.parameters,
-        parameters = _ref12$parameters === void 0 ? {} : _ref12$parameters;
-      var url = new URL(this.appUrl);
-      if (marketplaceId) {
-        url.hash = UrlJoin("/", type, flow, "marketplace", marketplaceId, Utils.B58(JSON.stringify(parameters)));
-      } else {
-        url.hash = UrlJoin("/", type, flow, Utils.B58(JSON.stringify(parameters)));
-      }
-      url.searchParams.set("origin", window.location.origin);
-      return url.toString();
-    }
-
-    // Internal loading methods
+    }() // Internal loading methods
   }, {
     key: "LoadAvailableMarketplaces",
     value: function () {
@@ -864,8 +844,8 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 produceLinkUrls: true,
                 authorizationToken: this.publicStaticToken,
                 noAuth: true,
-                select: ["*/.", "*/info/branding", "*/marketplaces/*/.", "*/marketplaces/*/info/tenant_id", "*/marketplaces/*/info/tenant_name", "*/marketplaces/*/info/branding", "*/marketplaces/*/info/storefront/background", "*/marketplaces/*/info/storefront/background_mobile"],
-                remove: ["*/info/branding/wallet_css", "*/marketplaces/*/info/branding/custom_css"]
+                select: ["*/.", "*/marketplaces/*/.", "*/marketplaces/*/info/tenant_id", "*/marketplaces/*/info/tenant_name", "*/marketplaces/*/info/branding", "*/marketplaces/*/info/storefront/background", "*/marketplaces/*/info/storefront/background_mobile"],
+                remove: ["*/marketplaces/*/info/branding/custom_css"]
               });
             case 5:
               metadata = _context12.sent;
@@ -942,7 +922,6 @@ var ElvWalletClient = /*#__PURE__*/function () {
                         marketplaceSlug: marketplaceSlug,
                         marketplaceId: objectId,
                         marketplaceHash: versionHash,
-                        tenantBranding: (metadata[tenantSlug].info || {}).branding || {},
                         order: Configuration.__MARKETPLACE_ORDER.findIndex(function (slug) {
                           return slug === marketplaceSlug;
                         })
@@ -980,12 +959,12 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "LatestMarketplaceHash",
     value: function () {
-      var _LatestMarketplaceHash = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref13) {
+      var _LatestMarketplaceHash = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee13(_ref12) {
         var marketplaceParams, marketplaceInfo, marketplaceLink;
         return _regeneratorRuntime.wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              marketplaceParams = _ref13.marketplaceParams;
+              marketplaceParams = _ref12.marketplaceParams;
               _context13.next = 3;
               return this.MarketplaceInfo({
                 marketplaceParams: marketplaceParams
@@ -1043,7 +1022,7 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 delete this.cachedMarketplaces[marketplaceId];
               }
               if (this.cachedMarketplaces[marketplaceId]) {
-                _context15.next = 28;
+                _context15.next = 21;
                 break;
               }
               _context15.next = 9;
@@ -1061,31 +1040,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
               });
             case 9:
               marketplace = _context15.sent;
-              if (!marketplace.branding.use_tenant_styling) {
-                _context15.next = 17;
-                break;
-              }
-              _context15.next = 13;
-              return this.client.ContentObjectMetadata({
-                libraryId: this.mainSiteLibraryId,
-                objectId: this.mainSiteId,
-                metadataSubtree: UrlJoin("/public", "asset_metadata", "tenants", marketplaceInfo.tenantSlug, "info", "branding"),
-                authorizationToken: this.publicStaticToken,
-                produceLinkUrls: true
-              });
-            case 13:
-              _context15.t0 = _context15.sent;
-              if (_context15.t0) {
-                _context15.next = 16;
-                break;
-              }
-              _context15.t0 = {};
-            case 16:
-              marketplace.tenantBranding = _context15.t0;
-            case 17:
-              _context15.next = 19;
+              _context15.next = 12;
               return Promise.all(marketplace.items.map( /*#__PURE__*/function () {
-                var _ref14 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(item, index) {
+                var _ref13 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee14(item, index) {
                   var authorizationToken;
                   return _regeneratorRuntime.wrap(function _callee14$(_context14) {
                     while (1) switch (_context14.prev = _context14.next) {
@@ -1130,10 +1087,10 @@ var ElvWalletClient = /*#__PURE__*/function () {
                   }, _callee14, null, [[5, 11]]);
                 }));
                 return function (_x18, _x19) {
-                  return _ref14.apply(this, arguments);
+                  return _ref13.apply(this, arguments);
                 };
               }()));
-            case 19:
+            case 12:
               marketplace.items = _context15.sent;
               marketplace.collections = (marketplace.collections || []).map(function (collection, collectionIndex) {
                 return _objectSpread(_objectSpread({}, collection), {}, {
@@ -1169,9 +1126,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 } catch (error) {}
               });
               this.cachedMarketplaces[marketplaceId] = marketplace;
-            case 28:
+            case 21:
               return _context15.abrupt("return", this.cachedMarketplaces[marketplaceId]);
-            case 29:
+            case 22:
             case "end":
               return _context15.stop();
           }
@@ -1187,12 +1144,12 @@ var ElvWalletClient = /*#__PURE__*/function () {
     value: function () {
       var _FilteredQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee16() {
         var _this6 = this;
-        var _ref15,
-          _ref15$mode,
+        var _ref14,
+          _ref14$mode,
           mode,
-          _ref15$sortBy,
+          _ref14$sortBy,
           sortBy,
-          _ref15$sortDesc,
+          _ref14$sortDesc,
           sortDesc,
           filter,
           editionFilters,
@@ -1208,27 +1165,27 @@ var ElvWalletClient = /*#__PURE__*/function () {
           capLimit,
           userAddress,
           sellerAddress,
-          _ref15$lastNDays,
+          _ref14$lastNDays,
           lastNDays,
-          _ref15$includeCheckou,
+          _ref14$includeCheckou,
           includeCheckoutLocked,
-          _ref15$start,
+          _ref14$start,
           start,
-          _ref15$limit,
+          _ref14$limit,
           limit,
           params,
           marketplaceInfo,
           marketplace,
           filters,
           path,
-          _ref17,
+          _ref16,
           contents,
           paging,
           _args16 = arguments;
         return _regeneratorRuntime.wrap(function _callee16$(_context16) {
           while (1) switch (_context16.prev = _context16.next) {
             case 0:
-              _ref15 = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {}, _ref15$mode = _ref15.mode, mode = _ref15$mode === void 0 ? "listings" : _ref15$mode, _ref15$sortBy = _ref15.sortBy, sortBy = _ref15$sortBy === void 0 ? "created" : _ref15$sortBy, _ref15$sortDesc = _ref15.sortDesc, sortDesc = _ref15$sortDesc === void 0 ? false : _ref15$sortDesc, filter = _ref15.filter, editionFilters = _ref15.editionFilters, attributeFilters = _ref15.attributeFilters, contractAddress = _ref15.contractAddress, tokenId = _ref15.tokenId, currency = _ref15.currency, marketplaceParams = _ref15.marketplaceParams, tenantId = _ref15.tenantId, collectionIndexes = _ref15.collectionIndexes, priceRange = _ref15.priceRange, tokenIdRange = _ref15.tokenIdRange, capLimit = _ref15.capLimit, userAddress = _ref15.userAddress, sellerAddress = _ref15.sellerAddress, _ref15$lastNDays = _ref15.lastNDays, lastNDays = _ref15$lastNDays === void 0 ? -1 : _ref15$lastNDays, _ref15$includeCheckou = _ref15.includeCheckoutLocked, includeCheckoutLocked = _ref15$includeCheckou === void 0 ? false : _ref15$includeCheckou, _ref15$start = _ref15.start, start = _ref15$start === void 0 ? 0 : _ref15$start, _ref15$limit = _ref15.limit, limit = _ref15$limit === void 0 ? 50 : _ref15$limit;
+              _ref14 = _args16.length > 0 && _args16[0] !== undefined ? _args16[0] : {}, _ref14$mode = _ref14.mode, mode = _ref14$mode === void 0 ? "listings" : _ref14$mode, _ref14$sortBy = _ref14.sortBy, sortBy = _ref14$sortBy === void 0 ? "created" : _ref14$sortBy, _ref14$sortDesc = _ref14.sortDesc, sortDesc = _ref14$sortDesc === void 0 ? false : _ref14$sortDesc, filter = _ref14.filter, editionFilters = _ref14.editionFilters, attributeFilters = _ref14.attributeFilters, contractAddress = _ref14.contractAddress, tokenId = _ref14.tokenId, currency = _ref14.currency, marketplaceParams = _ref14.marketplaceParams, tenantId = _ref14.tenantId, collectionIndexes = _ref14.collectionIndexes, priceRange = _ref14.priceRange, tokenIdRange = _ref14.tokenIdRange, capLimit = _ref14.capLimit, userAddress = _ref14.userAddress, sellerAddress = _ref14.sellerAddress, _ref14$lastNDays = _ref14.lastNDays, lastNDays = _ref14$lastNDays === void 0 ? -1 : _ref14$lastNDays, _ref14$includeCheckou = _ref14.includeCheckoutLocked, includeCheckoutLocked = _ref14$includeCheckou === void 0 ? false : _ref14$includeCheckou, _ref14$start = _ref14.start, start = _ref14$start === void 0 ? 0 : _ref14$start, _ref14$limit = _ref14.limit, limit = _ref14$limit === void 0 ? 50 : _ref14$limit;
               collectionIndexes = (collectionIndexes || []).map(function (i) {
                 return parseInt(i);
               });
@@ -1327,9 +1284,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
                 });
               }
               if (attributeFilters) {
-                attributeFilters.map(function (_ref16) {
-                  var name = _ref16.name,
-                    value = _ref16.value;
+                attributeFilters.map(function (_ref15) {
+                  var name = _ref15.name,
+                    value = _ref15.value;
                   if (!name || !value) {
                     return;
                   }
@@ -1426,9 +1383,9 @@ var ElvWalletClient = /*#__PURE__*/function () {
               }
               _context16.t1 = [];
             case 62:
-              _ref17 = _context16.t1;
-              contents = _ref17.contents;
-              paging = _ref17.paging;
+              _ref16 = _context16.t1;
+              contents = _ref16.contents;
+              paging = _ref16.paging;
               return _context16.abrupt("return", {
                 paging: {
                   start: params.start,
@@ -1472,12 +1429,12 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "MintingStatus",
     value: function () {
-      var _MintingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(_ref18) {
+      var _MintingStatus = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee17(_ref17) {
         var marketplaceParams, tenantId, marketplaceInfo, response;
         return _regeneratorRuntime.wrap(function _callee17$(_context17) {
           while (1) switch (_context17.prev = _context17.next) {
             case 0:
-              marketplaceParams = _ref18.marketplaceParams, tenantId = _ref18.tenantId;
+              marketplaceParams = _ref17.marketplaceParams, tenantId = _ref17.tenantId;
               if (tenantId) {
                 _context17.next = 6;
                 break;
@@ -1590,13 +1547,13 @@ var ElvWalletClient = /*#__PURE__*/function () {
   }, {
     key: "Initialize",
     value: function () {
-      var _Initialize = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee18(_ref19) {
-        var client, _ref19$appId, appId, _ref19$network, network, _ref19$mode, mode, localization, marketplaceParams, previewMarketplaceId, _ref19$storeAuthToken, storeAuthToken, _ref19$skipMarketplac, skipMarketplaceLoad, _ref20, tenantSlug, marketplaceSlug, marketplaceId, marketplaceHash, previewMarketplaceHash, walletClient, url, savedToken;
+      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, _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 = _ref19.client, _ref19$appId = _ref19.appId, appId = _ref19$appId === void 0 ? "general" : _ref19$appId, _ref19$network = _ref19.network, network = _ref19$network === void 0 ? "main" : _ref19$network, _ref19$mode = _ref19.mode, mode = _ref19$mode === void 0 ? "production" : _ref19$mode, localization = _ref19.localization, marketplaceParams = _ref19.marketplaceParams, previewMarketplaceId = _ref19.previewMarketplaceId, _ref19$storeAuthToken = _ref19.storeAuthToken, storeAuthToken = _ref19$storeAuthToken === void 0 ? true : _ref19$storeAuthToken, _ref19$skipMarketplac = _ref19.skipMarketplaceLoad, skipMarketplaceLoad = _ref19$skipMarketplac === void 0 ? false : _ref19$skipMarketplac;
-              _ref20 = marketplaceParams || {}, tenantSlug = _ref20.tenantSlug, marketplaceSlug = _ref20.marketplaceSlug, marketplaceId = _ref20.marketplaceId, marketplaceHash = _ref20.marketplaceHash;
+              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;
                 break;

package/package.json

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

package/src/walletClient/Utils.js

@@ -211,7 +211,9 @@ const Popup = ({url, title, w, h}) => {
     `
   );
 
-  if(window.focus) newWindow.focus();
+  if(newWindow && window.focus) {
+    newWindow.focus();
+  }
 
   return newWindow;
 };

package/src/walletClient/index.js

@@ -283,6 +283,42 @@ class ElvWalletClient {
     });
   }
 
+  async LogInURL({
+    mode="login",
+    provider,
+    marketplaceParams,
+    clearLogin
+  }) {
+    let loginUrl = new URL(this.appUrl);
+    loginUrl.hash = "/login";
+
+    loginUrl.searchParams.set("action", "login");
+
+    if(typeof window !== "undefined") {
+      loginUrl.searchParams.set("origin", window.location.origin);
+    }
+
+    if(provider) {
+      loginUrl.searchParams.set("provider", provider);
+    }
+
+    if(mode) {
+      loginUrl.searchParams.set("mode", mode);
+    }
+
+    if(marketplaceParams) {
+      loginUrl.searchParams.set("mid", (await this.MarketplaceInfo({marketplaceParams})).marketplaceHash);
+    } else if((this.selectedMarketplaceInfo || {}).marketplaceHash) {
+      loginUrl.searchParams.set("mid", this.selectedMarketplaceInfo.marketplaceHash);
+    }
+
+    if(clearLogin) {
+      loginUrl.searchParams.set("clear", "");
+    }
+
+    return loginUrl;
+  }
+
   /**
    * Direct the user to the Eluvio Media Wallet login page.
    *
@@ -313,29 +349,7 @@ class ElvWalletClient {
     clearLogin=false,
     callback
   }) {
-    let loginUrl = new URL(this.appUrl);
-    loginUrl.hash = "/login";
-
-    loginUrl.searchParams.set("origin", window.location.origin);
-    loginUrl.searchParams.set("action", "login");
-
-    if(provider) {
-      loginUrl.searchParams.set("provider", provider);
-    }
-
-    if(mode) {
-      loginUrl.searchParams.set("mode", mode);
-    }
-
-    if(marketplaceParams) {
-      loginUrl.searchParams.set("mid", (await this.MarketplaceInfo({marketplaceParams})).marketplaceHash);
-    } else if((this.selectedMarketplaceInfo || {}).marketplaceHash) {
-      loginUrl.searchParams.set("mid", this.selectedMarketplaceInfo.marketplaceHash);
-    }
-
-    if(clearLogin) {
-      loginUrl.searchParams.set("clear", "");
-    }
+    let loginUrl = await this.LogInURL({mode, provider, marketplaceParams, clearLogin});
 
     if(method === "redirect") {
       loginUrl.searchParams.set("response", "redirect");
@@ -632,10 +646,66 @@ class ElvWalletClient {
     return url.toString();
   }
 
+  async GenerateCodeAuth({url}={}) {
+    if(!url) {
+      url = await this.LogInURL({mode: "login"});
 
-  // Internal loading methods
+      url.searchParams.set("response", "code");
+      url.searchParams.set("source", "code");
+    }
+
+    const response = await Utils.ResponseToJson(
+      this.client.authClient.MakeAuthServiceRequest({
+        path: UrlJoin("as", "wlt", "login", "redirect", "metamask"),
+        method: "POST",
+        body: {
+          op: "create",
+          dest: url.toString()
+        }
+      })
+    );
 
+    response.code = response.id;
+    response.url = response.url.startsWith("https://") ? response.url : `https://${response.url}`;
+    response.metamask_url = response.metamask_url.startsWith("https://") ? response.metamask_url : `https://${response.metamask_url}`;
 
+    return response;
+  }
+
+  async SetCodeAuth({code, authToken}) {
+    await Utils.ResponseToJson(
+      this.client.authClient.MakeAuthServiceRequest({
+        path: UrlJoin("as", "wlt", "login", "session", code),
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${this.AuthToken()}`
+        },
+        body: {
+          op: "set",
+          id: code,
+          format: "auth_token",
+          payload: authToken
+        }
+      })
+    );
+  }
+
+  async GetCodeAuth({code, passcode}) {
+    try {
+      return await Utils.ResponseToJson(
+        this.client.authClient.MakeAuthServiceRequest({
+          path: UrlJoin("as", "wlt", "login", "redirect", "metamask", code, passcode),
+          method: "GET",
+        })
+      );
+    } catch(error) {
+      if(error && error.status === 404) { return undefined; }
+
+      throw error;
+    }
+  }
+
+  // Internal loading methods
 
   async LoadAvailableMarketplaces(forceReload=false) {
     if(!forceReload && Object.keys(this.availableMarketplaces) > 0) {

package/utilities/GenerateFabricToken.js

@@ -0,0 +1,23 @@
+const { ElvClient } = require("../src/ElvClient");
+
+const GenerateFabricToken = async () => {
+  try {
+    const client = await ElvClient.FromNetworkName({networkName: "main"});
+
+    const wallet = client.GenerateWallet();
+    const signer = wallet.AddAccount({
+      privateKey: process.env.PRIVATE_KEY
+    });
+
+    client.SetSigner({signer});
+
+    console.log(await client.CreateFabricToken({duration: process.env.DURATION}));
+  } catch(error) {
+    console.error(error);
+    console.error(JSON.stringify(error, null, 2));
+  }
+
+  process.exit(0);
+};
+
+GenerateFabricToken();