@onesub/server 0.18.1 → 0.18.3

package/dist/index.js

@@ -325,6 +325,10 @@ function mockValidateGoogleProduct(receipt, productId) {
 }
 
 // src/providers/apple.ts
+var EMPTY_APP_ACCOUNT_TOKEN = "00000000-0000-0000-0000-000000000000";
+function normalizeAppleAppAccountToken(token) {
+  return token === EMPTY_APP_ACCOUNT_TOKEN ? void 0 : token;
+}
 function derBase64ToPem(der) {
   return "-----BEGIN CERTIFICATE-----\n" + (der.match(/.{1,64}/g) ?? []).join("\n") + "\n-----END CERTIFICATE-----";
 }
@@ -400,7 +404,15 @@ function deriveStatus(tx, renewal) {
   return SUBSCRIPTION_STATUS.EXPIRED;
 }
 async function validateAppleReceipt(receipt, config) {
-  if (config.mockMode) return mockValidateAppleSubscription(receipt);
+  if (config.mockMode) {
+    const mock = mockValidateAppleSubscription(receipt);
+    if (mock) {
+      const boundAccountId = normalizeAppleAppAccountToken(mock.boundAccountId);
+      if (boundAccountId) mock.boundAccountId = boundAccountId;
+      else delete mock.boundAccountId;
+    }
+    return mock;
+  }
   let tx;
   try {
     tx = await decodeJws(receipt, config.skipJwsVerification);
@@ -427,6 +439,7 @@ async function validateAppleReceipt(receipt, config) {
   }
   const status = deriveStatus(tx, null);
   const purchasedAt = tx.originalPurchaseDate ?? tx.purchaseDate ?? Date.now();
+  const appAccountToken = normalizeAppleAppAccountToken(tx.appAccountToken);
   return {
     userId: "",
     // caller fills this in from the request body
@@ -438,11 +451,19 @@ async function validateAppleReceipt(receipt, config) {
     purchasedAt: new Date(purchasedAt).toISOString(),
     willRenew: status === SUBSCRIPTION_STATUS.ACTIVE,
     // refined by renewal info in webhook
-    ...tx.appAccountToken ? { boundAccountId: tx.appAccountToken } : {}
+    ...appAccountToken ? { boundAccountId: appAccountToken } : {}
   };
 }
 async function validateAppleConsumableReceipt(signedTransaction, config, expectedProductId) {
-  if (config.mockMode) return mockValidateAppleProduct(signedTransaction, expectedProductId);
+  if (config.mockMode) {
+    const mock = mockValidateAppleProduct(signedTransaction, expectedProductId);
+    if (mock) {
+      const appAccountToken = normalizeAppleAppAccountToken(mock.appAccountToken);
+      if (appAccountToken) mock.appAccountToken = appAccountToken;
+      else delete mock.appAccountToken;
+    }
+    return mock;
+  }
   let tx;
   try {
     tx = await decodeJws(signedTransaction, config.skipJwsVerification);
@@ -495,7 +516,7 @@ async function validateAppleConsumableReceipt(signedTransaction, config, expecte
     transactionId,
     productId: tx.productId,
     purchasedAt: tx.purchaseDate ? new Date(tx.purchaseDate).toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
-    appAccountToken: tx.appAccountToken ?? void 0
+    appAccountToken: normalizeAppleAppAccountToken(tx.appAccountToken)
   };
 }
 async function decodeAppleNotification(payload, skipJwsVerification = false) {
@@ -527,7 +548,7 @@ async function decodeAppleNotification(payload, skipJwsVerification = false) {
     status,
     willRenew,
     expiresAt: tx.expiresDate ? new Date(tx.expiresDate).toISOString() : null,
-    appAccountToken: tx.appAccountToken ?? null,
+    appAccountToken: normalizeAppleAppAccountToken(tx.appAccountToken) ?? null,
     inAppOwnershipType: tx.inAppOwnershipType ?? null
   };
 }
@@ -717,7 +738,7 @@ async function fetchAppleTransactionHistory(originalTransactionId, config, optio
           type: tx.type ?? "Unknown",
           purchasedAt: tx.purchaseDate ? new Date(tx.purchaseDate).toISOString() : (/* @__PURE__ */ new Date()).toISOString(),
           expiresAt: tx.expiresDate ? new Date(tx.expiresDate).toISOString() : null,
-          appAccountToken: tx.appAccountToken ?? null,
+          appAccountToken: normalizeAppleAppAccountToken(tx.appAccountToken) ?? null,
           inAppOwnershipType: tx.inAppOwnershipType ?? null,
           revocationDate: tx.revocationDate ? new Date(tx.revocationDate).toISOString() : null
         });