@onborn/billing 0.1.0-beta.1 → 0.1.0-beta.3

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.1.0-beta.3
+
+- Fixed StoreKit 2 purchases incorrectly using the signed transaction JWS as
+  the transaction identifier.
+- Bounded purchase idempotency keys when only a signed purchase token is
+  available.
+- Added structured billing request errors with backend messages and codes.
+
+## 0.1.0-beta.2
+
+- Removed `offeringId` from `useOnbornOffering` and
+  `BillingClient.loadOffering`.
+- Billing now loads only the offering marked Current for the project
+  environment.
+
 ## 0.1.0-beta.1
 
 - Added headless offering, paywall, purchase, restore, and entitlement APIs.

package/README.md

@@ -36,6 +36,11 @@ function PremiumGate() {
 The package owns the Onborn API URL. Configure credentials and user context
 once through `Onborn.init`; hooks and adapters do not accept an API key.
 
+`useOnbornOffering()` and `BillingClient.loadOffering()` always load the
+offering marked **Current** for the active project and environment. The public
+API accepts no offering ID. Select the current offering in Dashboard → Billing
+before loading a custom paywall.
+
 Installing `@onborn/billing` also installs its analytics and public-contract
 dependencies. You do not need `@onborn/rn-sdk` unless you render Onborn-built
 flows or paywalls.

package/dist/adapters/nativeStores.d.ts

@@ -1,6 +1,7 @@
 import type { NativeStoreRestoredPurchase } from "@onborn/sdk-contracts";
 import type { OnbornBillingAdapter, OnbornLoadProductsInput, OnbornPurchaseInput, OnbornRestoreInput } from "../types";
 type NativeStoresPurchase = {
+    id?: string;
     productId?: string;
     storeProductId?: string;
     transactionId?: string;

package/dist/adapters/nativeStores.js

@@ -143,6 +143,7 @@ function normalizeNativeRestoredPurchase(value) {
         store,
         storeProductId,
         transactionId: readString(record.transactionId) ??
+            readString(record.id) ??
             readString(record.originalTransactionIdentifierIOS),
         purchaseToken: readString(record.purchaseToken),
         raw: record.raw ?? value,
@@ -150,7 +151,7 @@ function normalizeNativeRestoredPurchase(value) {
 }
 function readTransactionId(purchase) {
     return (purchase?.transactionId ??
-        purchase?.purchaseToken ??
+        purchase?.id ??
         purchase?.originalTransactionIdentifierIOS);
 }
 function readString(value) {

package/dist/client.d.ts

@@ -2,6 +2,11 @@ import { type CustomerEntitlementsResponse, type GetOfferingResponse, type GetPa
 export type BillingClientOptions = {
     sourceId?: string;
 };
+export declare class OnbornBillingRequestError extends Error {
+    readonly status: number;
+    readonly code?: string | undefined;
+    constructor(message: string, status: number, code?: string | undefined);
+}
 export declare class BillingClient {
     private readonly options;
     private readonly config;
@@ -10,7 +15,7 @@ export declare class BillingClient {
     private readonly emitAnalyticsEvents;
     constructor(options?: BillingClientOptions);
     loadPaywall(paywallId: string): Promise<GetPaywallResponse>;
-    loadOffering(offeringId: string): Promise<GetOfferingResponse>;
+    loadOffering(): Promise<GetOfferingResponse>;
     validatePurchase(input: Omit<ValidatePurchaseRequest, "userId">): Promise<PurchaseValidationResponse>;
     restorePurchases(input: Omit<RestorePurchasesRequest, "userId">): Promise<PurchaseValidationResponse>;
     loadCustomerEntitlements(): Promise<CustomerEntitlementsResponse>;

package/dist/client.js

@@ -2,6 +2,16 @@ import { Onborn, } from "@onborn/analytics";
 import { resolveOnbornBillingConfig } from "./runtime";
 import { CustomerEntitlementsResponseSchema, GetOfferingResponseSchema, GetPaywallResponseSchema, PurchaseValidationResponseSchema, } from "@onborn/sdk-contracts";
 const ONBORN_API_BASE_URL = "https://api.testing.onborn.app";
+export class OnbornBillingRequestError extends Error {
+    status;
+    code;
+    constructor(message, status, code) {
+        super(message);
+        this.status = status;
+        this.code = code;
+        this.name = "OnbornBillingRequestError";
+    }
+}
 export class BillingClient {
     options;
     config;
@@ -24,9 +34,9 @@ export class BillingClient {
         }
         return parsed.data;
     }
-    async loadOffering(offeringId) {
-        const url = this.runtimeUrl(`/offerings/${encodeURIComponent(offeringId)}`);
-        const payload = await this.getJson(url, `offering '${offeringId}'`);
+    async loadOffering() {
+        const url = this.runtimeUrl("/offerings/current");
+        const payload = await this.getJson(url, "current offering");
         const parsed = GetOfferingResponseSchema.safeParse(payload);
         if (!parsed.success) {
             throw new Error("Invalid offering response payload");
@@ -113,7 +123,8 @@ export class BillingClient {
             body: JSON.stringify(payload),
         });
         if (!response.ok) {
-            throw new Error(`Purchase request failed (${response.status})`);
+            const failure = await readBillingFailure(response);
+            throw new OnbornBillingRequestError(failure.message ?? `Purchase request failed (${response.status})`, response.status, failure.code);
         }
         const parsed = PurchaseValidationResponseSchema.safeParse(await response.json());
         if (!parsed.success) {
@@ -135,6 +146,22 @@ export class BillingClient {
         });
     }
 }
+async function readBillingFailure(response) {
+    try {
+        const payload = (await response.json());
+        return {
+            message: typeof payload.error === "string"
+                ? payload.error
+                : typeof payload.message === "string"
+                    ? payload.message
+                    : undefined,
+            code: typeof payload.code === "string" ? payload.code : undefined,
+        };
+    }
+    catch {
+        return {};
+    }
+}
 export function createBillingClient(options = {}) {
     return new BillingClient(options);
 }

package/dist/useOnbornOffering.d.ts

@@ -1,7 +1,6 @@
 import { type CustomerEntitlement, type GetOfferingResponse } from "@onborn/sdk-contracts";
 import type { OnbornBillingAdapter, OnbornPackageWithProduct, OnbornPurchaseResult, OnbornRestoreResult } from "./types";
 export type UseOnbornOfferingOptions = {
-    offeringId: string;
     initialPackageId?: string;
     billingAdapter?: OnbornBillingAdapter;
     onPurchaseStarted?: (item: OnbornPackageWithProduct) => void;
@@ -26,4 +25,4 @@ export type UseOnbornOfferingState = {
     restorePurchases: () => Promise<OnbornRestoreResult>;
     refetchCustomerEntitlements: () => Promise<OnbornRestoreResult>;
 };
-export declare function useOnbornOffering(options: UseOnbornOfferingOptions): UseOnbornOfferingState;
+export declare function useOnbornOffering(options?: UseOnbornOfferingOptions): UseOnbornOfferingState;

package/dist/useOnbornOffering.js

@@ -3,7 +3,7 @@ import { createBillingClient } from "./client";
 import { useOnbornBillingConfig } from "./runtime";
 import { findPackageWithProduct, getPackagesWithProducts, resolveDefaultPackageId, } from "./utils";
 import { validateBillingPurchase, validateBillingRestore } from "./validation";
-export function useOnbornOffering(options) {
+export function useOnbornOffering(options = {}) {
     const runtimeOptions = useOnbornBillingConfig(options);
     const [data, setData] = useState(null);
     const [selectedPackageId, setSelectedPackageId] = useState(runtimeOptions.initialPackageId ?? null);
@@ -12,7 +12,7 @@ export function useOnbornOffering(options) {
     const [restoring, setRestoring] = useState(false);
     const [error, setError] = useState(null);
     const client = useMemo(() => createBillingClient({
-        sourceId: `offering:${runtimeOptions.offeringId}`,
+        sourceId: "offering:current",
     }), [
         runtimeOptions.apiKey,
         runtimeOptions.appId,
@@ -23,7 +23,6 @@ export function useOnbornOffering(options) {
         runtimeOptions.emitSdkConnectionSignal,
         runtimeOptions.fetchImpl,
         runtimeOptions.locale,
-        runtimeOptions.offeringId,
         runtimeOptions.platform,
         runtimeOptions.sdkVersion,
         runtimeOptions.userId,
@@ -38,7 +37,7 @@ export function useOnbornOffering(options) {
         setLoading(true);
         setError(null);
         try {
-            const response = await client.loadOffering(runtimeOptions.offeringId);
+            const response = await client.loadOffering();
             const products = await loadLocalizedProducts(runtimeOptions.billingAdapter, {
                 offering: response.offering,
                 products: response.products,
@@ -62,7 +61,6 @@ export function useOnbornOffering(options) {
     }, [
         client,
         runtimeOptions.billingAdapter,
-        runtimeOptions.offeringId,
         runtimeOptions.userId,
     ]);
     useEffect(() => {

package/dist/validation.js

@@ -44,7 +44,7 @@ export async function validateBillingRestore(input) {
 }
 function createPurchaseIdempotencyKey(input) {
     const stablePart = input.result.transactionId ??
-        input.result.purchaseToken ??
+        fingerprintIdempotencyValue(input.result.purchaseToken) ??
         input.result.productId ??
         input.item.product?.storeProductId ??
         input.item.package.id;
@@ -55,6 +55,18 @@ function createPurchaseIdempotencyKey(input) {
         stablePart,
     ].join(":");
 }
+function fingerprintIdempotencyValue(value) {
+    if (!value)
+        return undefined;
+    let first = 0x811c9dc5;
+    let second = 0x9e3779b9;
+    for (let index = 0; index < value.length; index += 1) {
+        const code = value.charCodeAt(index);
+        first = Math.imul(first ^ code, 0x01000193);
+        second = Math.imul(second ^ code, 0x85ebca6b);
+    }
+    return `${(first >>> 0).toString(36)}${(second >>> 0).toString(36)}`;
+}
 function createRestoreIdempotencyKey(input) {
     return ["restore", input.offering?.id ?? "unknown", String(Date.now())].join(":");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onborn/billing",
-  "version": "0.1.0-beta.1",
+  "version": "0.1.0-beta.3",
   "description": "Headless billing, offerings, purchases, restores, and entitlements for Onborn.",
   "license": "UNLICENSED",
   "repository": {