@wix/himalaya-cli 0.1309.0 → 0.1310.0

package/dist/authoring-runtime/node_modules/@wix/himalaya/dist/iap.mjs

@@ -156,7 +156,7 @@ function createPurchaseCoordinator(deps) {
       if (!isCurrent(session)) return noDelivery();
       const wasAllowed = item.finishAllowed;
       if (delivered.signInLost && !wasAllowed) {
-        blockWithoutSession(item, context);
+        blockWithoutSession(item);
         continue;
       }
       if (await deliverItem(session, item, context)) delivered.finished = true;
@@ -165,9 +165,8 @@ function createPurchaseCoordinator(deps) {
     }
     return delivered;
   }
-  function blockWithoutSession(item, context) {
-    const foreign = context !== void 0 && !sameAccount(item.transaction.appAccountToken, context.appAccountToken);
-    block(item.state, foreign ? "ownershipConflict" : "signInRequired", null);
+  function blockWithoutSession(item) {
+    block(item.state, item.transaction.appAccountToken === null ? "ownershipConflict" : "signInRequired", null);
   }
   async function deliverItem(session, item, context) {
     if (!item.finishAllowed) {
@@ -176,7 +175,7 @@ function createPurchaseCoordinator(deps) {
     return complete(session, item);
   }
   async function confirmAccess(session, item, context) {
-    if (!sameAccount(item.transaction.appAccountToken, context.appAccountToken)) {
+    if (item.transaction.appAccountToken === null) {
       block(item.state, "ownershipConflict", null);
       return false;
     }
@@ -368,6 +367,7 @@ function createPurchaseCoordinator(deps) {
     const known = new Set([...items.keys()].filter((key) => items.get(key).state.productId === context.productId));
     pendingApproval = { productId: context.productId, token: context.appAccountToken, known };
     setOutcome("awaitingApproval");
+    deps.onAwaitingApproval?.(context.productId);
     return true;
   }
   function setOutcome(next) {
@@ -459,10 +459,10 @@ function decodeContext(settled, isContext) {
   return { kind: "unavailable", retryAfterMs: retryAfter(raw.retryAfterMs) };
 }
 function isPurchaseContext(value) {
-  return isMemberContext(value) && isObject(value) && isNonEmpty(value.productId);
+  return isMemberContext(value) && isObject(value) && isNonEmpty(value.productId) && isNonEmpty(value.appAccountToken);
 }
 function isMemberContext(value) {
-  return isObject(value) && isNonEmpty(value.appAccountToken) && isNonEmpty(value.scopeKey);
+  return isObject(value) && isNonEmpty(value.scopeKey);
 }
 function retryAfter(value) {
   return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : void 0;
@@ -852,6 +852,92 @@ function onlineProgramItem(program, commerceDisplayPrice) {
   return { reference: { kind: ONLINE_PROGRAM, id }, ...commerceDisplayPrice ? { commerceDisplayPrice } : {} };
 }
 
+// ../../core/sdk/iap/src/host-session.ts
+var SIGNED_OUT = {
+  generation: 0,
+  kind: "signedOut",
+  memberId: null,
+  siteId: null,
+  appId: null,
+  ready: false,
+  epoch: 0
+};
+var KINDS = /* @__PURE__ */ new Set(["member", "visitor", "owner", "signedOut"]);
+function createHostSession(source) {
+  let seen = -1;
+  let latest = SIGNED_OUT;
+  const byGeneration = /* @__PURE__ */ new Map();
+  function pull() {
+    const snap = parseSession(source.current());
+    if (snap.generation < seen) return latest;
+    seen = snap.generation;
+    latest = snap;
+    const expectation = expectationOf(snap);
+    if (expectation && !byGeneration.has(snap.generation)) byGeneration.set(snap.generation, expectation);
+    return snap;
+  }
+  return {
+    identityBound: source.identityBound,
+    current() {
+      const snap = pull();
+      return { generation: snap.generation, kind: snap.kind };
+    },
+    identity(session) {
+      pull();
+      return byGeneration.get(session.generation) ?? null;
+    },
+    subscribe(listener) {
+      return source.subscribe(() => {
+        const before = seen;
+        pull();
+        if (latest.generation >= before) listener();
+      });
+    }
+  };
+}
+function hostSessionFromGlobal() {
+  const api = wixApiGlobal();
+  const session = api?.session;
+  if (!session || typeof session.current !== "function" || typeof session.subscribe !== "function") {
+    return createHostSession({ identityBound: false, current: () => SIGNED_OUT, subscribe: () => () => {
+    } });
+  }
+  return createHostSession({
+    identityBound: api?.identityBound === true,
+    current: () => session.current(),
+    subscribe: (listener) => session.subscribe(listener)
+  });
+}
+function memberIdentityOf(source) {
+  return { memberId: (session) => Promise.resolve(source.identity(session)?.memberId ?? null) };
+}
+function readIdentityBound() {
+  return wixApiGlobal()?.identityBound === true;
+}
+function expectationOf(snap) {
+  if (!snap.ready || snap.kind !== "member" || !snap.memberId || !snap.siteId || !snap.appId) return null;
+  return { generation: snap.generation, kind: "member", memberId: snap.memberId, siteId: snap.siteId, appId: snap.appId };
+}
+function parseSession(raw) {
+  if (raw === null || typeof raw !== "object") return SIGNED_OUT;
+  const value = raw;
+  const kind = value.kind;
+  if (typeof value.generation !== "number" || !Number.isSafeInteger(value.generation)) return SIGNED_OUT;
+  if (typeof kind !== "string" || !KINDS.has(kind)) return SIGNED_OUT;
+  return {
+    generation: value.generation,
+    kind,
+    memberId: typeof value.memberId === "string" && value.memberId.length > 0 ? value.memberId : null,
+    siteId: typeof value.siteId === "string" && value.siteId.length > 0 ? value.siteId : null,
+    appId: typeof value.appId === "string" && value.appId.length > 0 ? value.appId : null,
+    ready: value.ready === true,
+    epoch: typeof value.epoch === "number" ? value.epoch : 0
+  };
+}
+function wixApiGlobal() {
+  return globalThis.himalaya?.wixApi;
+}
+
 // ../../core/sdk/iap/src/wix-payments-wire.ts
 function startPaymentCall(scope, wixTransactionId) {
   return post(scope, "/payments/start", { appId: scope.binding.purchasesAppId, wixTransactionId });
@@ -859,9 +945,6 @@ function startPaymentCall(scope, wixTransactionId) {
 function completePaymentCall(scope, signedTransaction) {
   return post(scope, "/payments/complete", { appId: scope.binding.purchasesAppId, apple: { signedTransaction } });
 }
-function customerIdCall(scope) {
-  return get(scope, `/customer-id?appId=${encodeURIComponent(scope.binding.purchasesAppId)}`);
-}
 function paymentCall(scope, paymentId) {
   return get(scope, `/payments/${encodeURIComponent(paymentId)}`);
 }
@@ -869,16 +952,13 @@ function isRoutePrefix(prefix) {
   return /^\/[A-Za-z0-9._~\-/]*[A-Za-z0-9._~-]$/.test(prefix);
 }
 function decodeStarted(raw, expected) {
-  if (!isObject3(raw) || !isStoreProductId(raw.storeProductId) || !isUUID(raw.customerId)) return null;
+  if (!isObject3(raw) || !isStoreProductId(raw.storeProductId) || !isUUID(raw.appAccountToken)) return null;
   const payment = decodePayment(raw.payment, expected);
-  return payment && { payment, storeProductId: raw.storeProductId, customerId: raw.customerId };
+  return payment && { payment, storeProductId: raw.storeProductId, appAccountToken: raw.appAccountToken };
 }
 function decodePaymentAnswer(raw, expected) {
   return isObject3(raw) ? decodePayment(raw.payment, expected) : null;
 }
-function decodeCustomerId(raw) {
-  return isObject3(raw) && isUUID(raw.customerId) ? raw.customerId : null;
-}
 function decodePayment(raw, expected) {
   if (!isObject3(raw) || !hasPaymentIds(raw) || !echoes(raw, expected) || !hasValidOptionals(raw)) return null;
   const status = ownValue(STATUSES, raw.status);
@@ -993,7 +1073,7 @@ function createWixIapClient(deps) {
       codes: START_PAYMENT_CODES,
       request: (scope) => startPaymentCall(scope, input.wixTransactionId),
       decode: (raw, scope) => {
-        const started = decodeStarted(raw, { ...expectationOf(scope), wixTransactionId: input.wixTransactionId });
+        const started = decodeStarted(raw, { ...expectationOf2(scope), wixTransactionId: input.wixTransactionId });
         return started && { status: "started", ...started };
       }
     });
@@ -1006,22 +1086,11 @@ function createWixIapClient(deps) {
       codes: COMPLETE_PAYMENT_CODES,
       request: (scope) => completePaymentCall(scope, transaction.signedTransaction),
       decode: (raw, scope) => {
-        const payment = decodePaymentAnswer(raw, expectationOf(scope));
+        const payment = decodePaymentAnswer(raw, expectationOf2(scope));
         return payment && { status: "matched", payment };
       }
     });
   }
-  function getCustomerId() {
-    return run({
-      operation: "getCustomerId",
-      codes: GET_CUSTOMER_ID_CODES,
-      request: customerIdCall,
-      decode: (raw) => {
-        const customerId = decodeCustomerId(raw);
-        return customerId ? { status: "found", customerId } : null;
-      }
-    });
-  }
   function getPayment(input) {
     if (!isUUID(input.paymentId)) return Promise.resolve(failure("getPayment", "invalidArgument"));
     return run({
@@ -1029,7 +1098,7 @@ function createWixIapClient(deps) {
       codes: GET_PAYMENT_CODES,
       request: (scope) => paymentCall(scope, input.paymentId),
       decode: (raw, scope) => {
-        const payment = decodePaymentAnswer(raw, { ...expectationOf(scope), paymentId: input.paymentId });
+        const payment = decodePaymentAnswer(raw, { ...expectationOf2(scope), paymentId: input.paymentId });
         return payment && { status: "found", payment };
       }
     });
@@ -1062,17 +1131,26 @@ function createWixIapClient(deps) {
     const transport = deps.transport ?? bridgeTransport();
     if (!transport) return refused(spec.operation, "notEnabled");
     if (!isCurrent(scope.session)) return refused(spec.operation, "sessionChanged");
-    const outcome = await attempt(transport, spec.request(scope), spec);
+    const expectation = boundExpectation(scope.session, deps.transport == null);
+    if (expectation === "refuse") return refused(spec.operation, "notEnabled");
+    const outcome = await attempt(transport, spec.request(scope), spec, expectation);
     return isCurrent(scope.session) ? outcome : refused(spec.operation, "sessionChanged");
   }
+  function boundExpectation(session, liveHost) {
+    const source = deps.session;
+    if (liveHost && (source.identityBound !== true || !readIdentityBound())) return "refuse";
+    if (typeof source.identity !== "function") return liveHost ? "refuse" : void 0;
+    return source.identity(session) ?? "refuse";
+  }
   function isCurrent(session) {
     return deps.session.current().generation === session.generation;
   }
-  return { startPayment, completePayment, getCustomerId, getPayment };
+  return { startPayment, completePayment, getPayment };
 }
-async function attempt(transport, call, spec) {
+async function attempt(transport, call, spec, expectation) {
   try {
-    return { answer: await transport.call(call.method, call.path, call.body, call.headers) };
+    const answer = expectation ? await transport.call(call.method, call.path, call.body, call.headers, expectation) : await transport.call(call.method, call.path, call.body, call.headers);
+    return { answer };
   } catch (error) {
     return { failure: classifyFailure(error, spec.operation, spec.codes) };
   }
@@ -1087,7 +1165,7 @@ async function read(call, operation) {
 function refused(operation, kind) {
   return { failure: failure(operation, kind) };
 }
-function expectationOf(scope) {
+function expectationOf2(scope) {
   return { appId: scope.binding.purchasesAppId, memberId: scope.memberId };
 }
 function refuseProof(transaction) {
@@ -1119,9 +1197,9 @@ var COMPLETE_PAYMENT_CODES = [
   "NOT_PURCHASED",
   "ZERO_PRICE",
   "NO_MATCHING_PAYMENT",
+  "PAYMENT_NOT_PENDING",
   "APP_NOT_CONFIGURED"
 ];
-var GET_CUSTOMER_ID_CODES = ["APP_NOT_CONFIGURED"];
 var GET_PAYMENT_CODES = ["NOT_FOUND"];
 
 // ../../core/sdk/iap/src/index.ts
@@ -1223,6 +1301,7 @@ export {
   MAX_RETRY_DELAY_MS,
   appleManagedStore,
   consume,
+  createHostSession,
   createIapCatalogPricing,
   createPricingController,
   createPurchaseCoordinator,
@@ -1232,10 +1311,13 @@ export {
   getPaywallConfig,
   getProducts,
   getUnfinishedTransactions,
+  hostSessionFromGlobal,
   iapPriceFields,
+  memberIdentityOf,
   onlineProgramItem,
   purchase,
   purchaseForVerification,
+  readIdentityBound,
   restore,
   version
 };