Revert entitlement purchase (#70)

* Revert "Temporarily render bundled media property as media sections"

This reverts commit 96a1614.

* Revert "Add purchase entitlement support (#68)"

This reverts commit 5c594ea.

package.json

@@ -34,7 +34,7 @@
   },
   "dependencies": {
     "@eluvio/crypto": "^1.1.1",
-    "@eluvio/elv-client-js": "^4.0.80",
+    "@eluvio/elv-client-js": "^4.0.75",
     "@eluvio/elv-embed": "git+https://github.com/eluv-io/elv-embed.git",
     "@eluvio/elv-paymentgate": "^1.0.0",
     "@eluvio/elv-player-js": "^1.0.117",

src/components/marketplace/MintingStatus.js

@@ -762,53 +762,6 @@ export const ClaimMintingStatus = observer(() => {
   );
 });
 
-export const EntitlementMintingStatus = observer(() => {
-  const match = useRouteMatch();
-  const [status, setStatus] = useState(undefined);
-
-  const marketplace = rootStore.marketplaces[match.params.marketplaceId];
-  const animation = MobileOption(rootStore.pageWidth, marketplace?.storefront?.purchase_animation, marketplace?.storefront?.purchase_animation_mobile);
-  const videoHash = LinkTargetHash(animation);
-
-  const revealAnimation = MobileOption(rootStore.pageWidth, marketplace?.storefront?.reveal_animation, marketplace?.storefront?.reveal_animation_mobile);
-  const revealVideoHash = LinkTargetHash(revealAnimation);
-
-  const hideText = marketplace?.storefront?.hide_text;
-
-  const Status = async () => await rootStore.EntitlementClaimStatus({
-    marketplaceId: match.params.marketplaceId,
-    purchaseId: match.params.purchaseId
-  });
-
-  if(!status) {
-    return (
-      <MintingStatus
-        key={`status-${videoHash}`}
-        videoHash={videoHash}
-        revealVideoHash={revealVideoHash}
-        hideText={hideText}
-        Status={Status}
-        OnFinish={({status}) => setStatus(status)}
-        basePath={UrlJoin("/marketplace", match.params.marketplaceId)}
-        backText={rootStore.l10n.status.back_to_marketplace}
-      />
-    );
-  }
-
-  let items = status.items;
-  return (
-    <MintResults
-      skipReveal={marketplace?.storefront?.skip_reveal}
-      header={rootStore.l10n.status.minting.success_header}
-      subheader={rootStore.l10n.status.minting["received_item_single"]}
-      items={items}
-      basePath={UrlJoin("/marketplace", match.params.marketplaceId)}
-      nftBasePath={UrlJoin("/marketplace", match.params.marketplaceId, "users", "me", "items")}
-      backText={rootStore.l10n.status.back_to_marketplace}
-    />
-  );
-});
-
 export const PackOpenStatus = observer(() => {
   const [status, setStatus] = useState(undefined);
 

src/routes/index.js

@@ -12,7 +12,7 @@ import {
   DropMintingStatus,
   PackOpenStatus,
   PurchaseMintingStatus,
-  DepositStatus, GiftRedemptionStatus, GiftPurchaseMintingStatus, EntitlementMintingStatus,
+  DepositStatus, GiftRedemptionStatus, GiftPurchaseMintingStatus
 } from "Components/marketplace/MintingStatus";
 import UserListings from "Components/user/UserListings";
 import UserItems from "Components/user/UserItems";
@@ -21,7 +21,6 @@ import {ErrorBoundary} from "Components/common/ErrorBoundary";
 import MarketplaceCollectionsSummaryPage from "Components/marketplace/MarketplaceCollectionsSummary";
 import MarketplaceCollection from "Components/marketplace/MarketplaceCollection";
 import MarketplaceCollectionRedemption from "Components/marketplace/MarketplaceCollectionRedemption";
-import EntitlementClaim from "Components/marketplace/EntitlementClaim";
 import {LoginGate} from "Components/common/LoginGate";
 import {observer} from "mobx-react";
 import UserProfileContainer from "Components/profile/UserProfileContainer";
@@ -124,9 +123,6 @@ const MarketplaceRoutes = () => {
     { name: "Redeem Collection", path: "collections/:collectionSKU/redeem", Component: MarketplaceCollectionRedemption },
     { name: "Redeem Collection", path: "collections/:collectionSKU/redeem/:confirmationId/status", Component: CollectionRedeemStatus },
 
-    { name: "Redeem Entitlement", path: "store/:sku/entitle/:signature", Component: EntitlementClaim },
-    { name: "Redeem Entitlement", path: "store/:sku/entitle/status/:purchaseId", Component: EntitlementMintingStatus },
-
     ...TokenRoutes("collections/:collectionSKU/owned"),
 
     { name: "Drop Event", path: "events/:tenantSlug/:eventSlug/:dropId", Component: Drop, hideNavigation: true, authed: true, ignoreLoginCapture: true },

src/stores/Checkout.js

@@ -472,25 +472,6 @@ class CheckoutStore {
     }
   });
 
-  EntitlementClaim = flow(function * ({entitlementSignature}) {
-    const decode = yield this.client.DecodeSignedMessageJSON({signedMessage: entitlementSignature});
-
-    const tenantId = decode?.message?.tenant_id;
-    const body =  {"op": "nft-claim-entitlement", "signature": entitlementSignature};
-
-    const data = (yield this.client.utils.ResponseToJson(this.client.authClient.MakeAuthServiceRequest({
-      path: UrlJoin("as", "wlt", "act", tenantId),
-      method: "POST",
-      body: body,
-      headers: {
-        Authorization: `Bearer ${this.walletClient.AuthToken()}`
-      }
-    })));
-
-    const splits = data?.op?.split(":");
-    return splits?.length > 3 ? splits[3] : "";
-  });
-
   ListingCheckoutSubmit = flow(function * ({
     provider="stripe",
     marketplaceId,

src/stores/index.js

@@ -401,32 +401,21 @@ class RootStore {
         noAuth: true
       });
 
-      let authParameter;
       try {
         const auth = searchParams.get("auth");
+
         if(auth) {
-          const parsedAuth = JSON.parse(Utils.FromB64(auth));
-          if(parsedAuth.idToken && !parsedAuth.clientAuthToken && !parsedAuth.clientSigningToken) {
-            authParameter = {
-              idToken: parsedAuth.idToken,
-              signerURIs: ["https://wlt.stg.svc.eluv.io"],
-              user: {
-                name: parsedAuth.user,
-                verified: true,
-              }
-            };
-          } else {
-            this.SetAuthInfo(parsedAuth);
-          }
+          this.SetAuthInfo(JSON.parse(Utils.FromB64(auth)));
         }
       } catch(error) {
         this.Log("Failed to load auth from parameter", true);
         this.Log(error, true);
       }
 
       if(!this.inFlow) {
-        if(authParameter || this.AuthInfo()) {
-          yield this.Authenticate(authParameter || this.AuthInfo());
+        if(this.AuthInfo()) {
+          this.Log("Authenticating from saved session");
+          yield this.Authenticate(this.AuthInfo());
         } else if(this.auth0) {
           // Attempt to re-auth with auth0. If 'code' is present in URL params, we are returning from Auth0 callback, let the login component handle it
           yield this.AuthenticateAuth0({});
@@ -1331,10 +1320,6 @@ class RootStore {
     return yield this.walletClient.ClaimStatus({marketplaceParams: { marketplaceId }, sku});
   });
 
-  EntitlementClaimStatus = flow(function * ({marketplaceId, purchaseId}) {
-    return yield this.walletClient.EntitlementClaimStatus({marketplaceParams: { marketplaceId }, purchaseId});
-  });
-
   GiftClaimStatus = flow(function * ({marketplaceId, confirmationId}) {
     return yield this.walletClient.GiftClaimStatus({marketplaceParams: { marketplaceId }, confirmationId});
   });

src/utils/Utils.js

@@ -202,7 +202,7 @@ const FormatAdditionalMedia = ({nft, name, metadata={}}) => {
   let additionalMedia, additionalMediaType, hasAdditionalMedia;
   let watchedMediaIds = [];
 
-  if(["Sections", "property"].includes(metadata?.additional_media_type)) {
+  if(metadata?.additional_media_type === "Sections") {
     additionalMediaType = "Sections";
     additionalMedia = { ...(metadata?.additional_media_sections || {}) };
     hasAdditionalMedia = additionalMedia.featured_media?.length > 0 ||