@eluvio/elv-client-js 4.0.39 → 4.0.41

package/package.json

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

package/src/walletClient/index.js

@@ -672,7 +672,7 @@ class ElvWalletClient {
     return response;
   }
 
-  async SetCodeAuth({code, address, authToken}) {
+  async SetCodeAuth({code, address, type, authToken}) {
     await Utils.ResponseToJson(
       this.client.authClient.MakeAuthServiceRequest({
         path: UrlJoin("as", "wlt", "login", "session", code),
@@ -687,6 +687,7 @@ class ElvWalletClient {
           payload: JSON.stringify({
             addr: Utils.FormatAddress(address),
             eth: address ? `ikms${Utils.AddressToHash(address)}` : "",
+            type,
             token: authToken
           })
         }
@@ -719,7 +720,7 @@ class ElvWalletClient {
     let metadata = await this.client.ContentObjectMetadata({
       libraryId: this.mainSiteLibraryId,
       objectId: this.mainSiteId,
-      metadataSubtree: "public/asset_metadata/tenants",
+      metadataSubtree: "public/asset_metadata",
       resolveLinks: true,
       linkDepthLimit: 2,
       resolveIncludeSource: true,
@@ -728,21 +729,25 @@ class ElvWalletClient {
       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"
+        "info/marketplace_order",
+        "tenants/*/.",
+        "tenants/*/info/branding",
+        "tenants/*/marketplaces/*/.",
+        "tenants/*/marketplaces/*/info/tenant_id",
+        "tenants/*/marketplaces/*/info/tenant_name",
+        "tenants/*/marketplaces/*/info/branding",
+        "tenants/*/marketplaces/*/info/storefront/background",
+        "tenants/*/marketplaces/*/info/storefront/background_mobile"
       ],
       remove: [
-        "*/info/branding/wallet_css",
-        "*/marketplaces/*/info/branding/custom_css"
+        "tenants/*/info/branding/wallet_css",
+        "tenants/*/marketplaces/*/info/branding/custom_css"
       ]
     });
 
+    const marketplaceOrder = ((metadata || {}).info || {}).marketplace_order || [];
+    metadata = (metadata || {}).tenants || {};
+
     // If preview marketplace is specified, load it appropriately
     if(this.previewMarketplaceId) {
       let previewTenantSlug = "PREVIEW";
@@ -826,7 +831,7 @@ class ElvWalletClient {
               marketplaceId: objectId,
               marketplaceHash: versionHash,
               tenantBranding: (metadata[tenantSlug].info || {}).branding || {},
-              order: Configuration.__MARKETPLACE_ORDER.findIndex(slug => slug === marketplaceSlug)
+              order: marketplaceOrder.findIndex(slug => slug === marketplaceSlug)
             };
 
             availableMarketplacesById[objectId] = availableMarketplaces[tenantSlug][marketplaceSlug];