@eluvio/elv-client-js 4.0.117 → 4.0.118

package/src/walletClient/index.js

@@ -185,6 +185,12 @@ class ElvWalletClient {
       }
     }
 
+    walletClient.topLevelInfo = await client.utils.ResponseToJson(
+      client.MakeAuthServiceRequest({
+        path: "/as/mw/toplevel"
+      })
+    );
+
     if(!skipMarketplaceLoad) {
       await walletClient.LoadAvailableMarketplaces();
     }
@@ -749,136 +755,29 @@ class ElvWalletClient {
       return;
     }
 
-    let metadata = await this.client.ContentObjectMetadata({
-      libraryId: this.mainSiteLibraryId,
-      objectId: this.mainSiteId,
-      metadataSubtree: "public/asset_metadata",
-      resolveLinks: true,
-      linkDepthLimit: 2,
-      resolveIncludeSource: true,
-      resolveIgnoreErrors: true,
-      produceLinkUrls: true,
-      authorizationToken: this.publicStaticToken,
-      noAuth: true,
-      select: [
-        "info/marketplace_order",
-        "tenants/*/.",
-        "tenants/*/info/branding/show",
-        "tenants/*/info/branding/name",
-        "tenants/*/marketplaces/*/.",
-        "tenants/*/marketplaces/*/info/tenant_id",
-        "tenants/*/marketplaces/*/info/tenant_name",
-        "tenants/*/marketplaces/*/info/branding/show",
-        "tenants/*/marketplaces/*/info/branding/name"
-      ]
-    });
+    const marketplaces = this.topLevelInfo.marketplaces;
 
-    const marketplaceOrder = ((metadata || {}).info || {}).marketplace_order || [];
-    metadata = (metadata || {}).tenants || {};
-
-    // If preview marketplace is specified, load it appropriately
-    if(this.previewMarketplaceId) {
-      let previewTenantSlug = "PREVIEW";
-      let previewMarketplaceSlug, previewMarketplaceMetadata;
-      Object.keys(metadata || {}).forEach(tenantSlug =>
-        Object.keys(metadata[tenantSlug].marketplaces || {}).forEach(marketplaceSlug => {
-          const versionHash = metadata[tenantSlug].marketplaces[marketplaceSlug]["."].source;
-          const objectId = this.utils.DecodeVersionHash(versionHash).objectId;
-
-          if(objectId === this.previewMarketplaceId) {
-            // Marketplace exists in site meta
-            previewTenantSlug = tenantSlug;
-            previewMarketplaceSlug = marketplaceSlug;
-
-            // Deployed marketplace is same as preview marketplace
-            if(versionHash === this.previewMarketplaceHash) {
-              previewMarketplaceMetadata = metadata[tenantSlug].marketplaces[marketplaceSlug];
-            }
-          }
-        })
-      );
-
-      // Marketplace not present in branch, or preview version is different - Load metadata directly
-      if(!previewMarketplaceMetadata) {
-        previewMarketplaceMetadata = await this.client.ContentObjectMetadata({
-          versionHash: this.previewMarketplaceHash,
-          metadataSubtree: "public/asset_metadata",
-          produceLinkUrls: true,
-          authorizationToken: this.publicStaticToken,
-          noAuth: true,
-          select: [
-            "slug",
-            "info/tenant_id",
-            "info/tenant_name",
-            "info/branding",
-          ],
-          remove: [
-            "info/branding/custom_css"
-          ]
-        });
+    let availableMarketplaces = { ...(this.availableMarketplaces || {}) };
+    let availableMarketplacesById = { ...(this.availableMarketplacesById || {}) };
 
-        if(!previewMarketplaceSlug) {
-          previewMarketplaceSlug = previewMarketplaceMetadata.slug;
-        }
-      }
+    marketplaces.map(marketplaceInfo => {
+      const marketplaceId = Utils.DecodeVersionHash(marketplaceInfo.source_hash).objectId;
+      const marketplaceSlug = marketplaceInfo.slug || marketplaceInfo.name;
 
-      previewMarketplaceMetadata["."] = {
-        source: this.previewMarketplaceHash
-      };
+      availableMarketplaces[marketplaceInfo.tenant_slug] = availableMarketplaces[marketplaceInfo.tenant_slug] || {};
 
-      previewMarketplaceMetadata.info["."] = {
-        source: this.previewMarketplaceHash
+      availableMarketplaces[marketplaceInfo.tenant_slug][marketplaceSlug] = {
+        tenantName: marketplaceInfo.tenant_slug,
+        tenantSlug: marketplaceInfo.tenant_slug,
+        tenantId: marketplaceInfo.tenant_id,
+        marketplaceSlug: marketplaceSlug,
+        marketplaceId,
+        marketplaceHash: marketplaceInfo.source_hash,
       };
 
-      previewMarketplaceMetadata.info.branding.preview = true;
-      previewMarketplaceMetadata.info.branding.show = true;
-
-      metadata[previewTenantSlug] = metadata[previewTenantSlug] || {};
-      metadata[previewTenantSlug].marketplaces = metadata[previewTenantSlug].marketplaces || {};
-      metadata[previewTenantSlug].marketplaces[previewMarketplaceSlug] = previewMarketplaceMetadata;
-    }
-
-    let availableMarketplaces = { ...(this.availableMarketplaces || {}) };
-    let availableMarketplacesById = { ...(this.availableMarketplacesById || {}) };
-    Object.keys(metadata || {}).forEach(tenantSlug => {
-      try {
-        availableMarketplaces[tenantSlug] = metadata[tenantSlug]["."] ?
-          { versionHash: metadata[tenantSlug]["."].source } : { };
+      availableMarketplacesById[marketplaceId] = availableMarketplaces[marketplaceInfo.tenant_slug][marketplaceSlug];
 
-        Object.keys(metadata[tenantSlug].marketplaces || {}).forEach(marketplaceSlug => {
-          try {
-            const versionHash = metadata[tenantSlug].marketplaces[marketplaceSlug]["."].source;
-            const objectId = this.utils.DecodeVersionHash(versionHash).objectId;
-
-            availableMarketplaces[tenantSlug][marketplaceSlug] = {
-              ...(metadata[tenantSlug].marketplaces[marketplaceSlug].info || {}),
-              tenantName: metadata[tenantSlug].marketplaces[marketplaceSlug].info.tenant_name,
-              tenantId: metadata[tenantSlug].marketplaces[marketplaceSlug].info.tenant_id,
-              tenantSlug,
-              marketplaceSlug,
-              marketplaceId: objectId,
-              marketplaceHash: versionHash,
-              tenantBranding: (metadata[tenantSlug].info || {}).branding || {},
-              order: marketplaceOrder.findIndex(slug => slug === marketplaceSlug)
-            };
-
-            availableMarketplacesById[objectId] = availableMarketplaces[tenantSlug][marketplaceSlug];
-
-            this.marketplaceHashes[objectId] = versionHash;
-
-            // Fill out selected marketplace info
-            if(this.selectedMarketplaceInfo) {
-              if((this.selectedMarketplaceInfo.tenantSlug === tenantSlug && this.selectedMarketplaceInfo.marketplaceSlug === marketplaceSlug) || this.selectedMarketplaceInfo.marketplaceId === objectId) {
-                this.selectedMarketplaceInfo = availableMarketplaces[tenantSlug][marketplaceSlug];
-              }
-            }
-          } catch(error) {
-            this.Log(`Eluvio Wallet Client: Unable to load info for marketplace ${tenantSlug}/${marketplaceSlug}`, true);
-          }
-        });
-      } catch(error) {
-        this.Log(`Eluvio Wallet Client: Failed to load tenant info ${tenantSlug}`, true, error);
-      }
+      this.marketplaceHashes[marketplaceId] = marketplaceInfo.source_hash;
     });
 
     this.availableMarketplaces = availableMarketplaces;
@@ -1352,6 +1251,7 @@ class ElvWalletClient {
           }
 
           if(op === "nft-claim-entitlement") {
+            // eslint-disable-next-line no-unused-vars
             let [op, marketplace, sku, purchaseId ] = status.op.split(":");
             confirmationId = purchaseId;
             if(status.extra && status.extra["0"]) {