@funnelsgrove/runtime 0.10.0 → 0.11.0

package/dist/services/funnel-sdk-payments.functions.d.ts

@@ -0,0 +1,44 @@
+export type PublishedStripeSelectionInput = {
+    planId?: string | null;
+    planKey?: string | null;
+    offerSetId?: string | null;
+    paymentProfileId?: string | null;
+    provider?: 'stripe' | null;
+    providerPlanId?: string | null;
+    runtimeConfigRevisionId?: string | null;
+};
+export declare const toV2CheckoutSelection: (input: PublishedStripeSelectionInput) => {
+    runtimeConfigRevisionId: string | undefined;
+    offerSetId: string | undefined;
+    paymentProfileId: string | undefined;
+    provider: "stripe" | null | undefined;
+    providerPlanId: string | undefined;
+    planKey: string | undefined;
+};
+export declare const toV2CheckoutSessionRequest: (input: PublishedStripeSelectionInput & {
+    couponId?: string | null;
+    analyticsMetadata?: Record<string, unknown> | null;
+    customerEmail?: string | null;
+    returnUrl: string;
+    userId?: string | null;
+    anonymousUserId?: string | null;
+    idempotencyKey?: string | null;
+    environment?: "test" | "live";
+}, checkoutType: "subscription" | "one_time") => {
+    checkoutType: "one_time" | "subscription";
+    uiMode: string;
+    couponId: string | null | undefined;
+    analyticsMetadata: Record<string, unknown> | null | undefined;
+    customerEmail: string | null | undefined;
+    returnUrl: string;
+    userId: string | null | undefined;
+    anonymousUserId: string | null | undefined;
+    idempotencyKey: string | null | undefined;
+    environment: "test" | "live" | undefined;
+    runtimeConfigRevisionId: string | undefined;
+    offerSetId: string | undefined;
+    paymentProfileId: string | undefined;
+    provider: "stripe" | null | undefined;
+    providerPlanId: string | undefined;
+    planKey: string | undefined;
+};

package/dist/services/funnel-sdk-payments.functions.js

@@ -0,0 +1,16 @@
+export const toV2CheckoutSelection = (input) => {
+    var _a, _b, _c, _d, _e, _f;
+    const selection = {
+        runtimeConfigRevisionId: (_a = input.runtimeConfigRevisionId) === null || _a === void 0 ? void 0 : _a.trim(),
+        offerSetId: (_b = input.offerSetId) === null || _b === void 0 ? void 0 : _b.trim(),
+        paymentProfileId: (_c = input.paymentProfileId) === null || _c === void 0 ? void 0 : _c.trim(),
+        provider: input.provider,
+        providerPlanId: (_d = input.providerPlanId) === null || _d === void 0 ? void 0 : _d.trim(),
+        planKey: ((_e = input.planKey) === null || _e === void 0 ? void 0 : _e.trim()) || ((_f = input.planId) === null || _f === void 0 ? void 0 : _f.trim()),
+    };
+    if (selection.provider !== 'stripe' || Object.values(selection).some((value) => !value)) {
+        throw new Error('Published Stripe checkout selection is incomplete');
+    }
+    return selection;
+};
+export const toV2CheckoutSessionRequest = (input, checkoutType) => (Object.assign(Object.assign({}, toV2CheckoutSelection(input)), { checkoutType, uiMode: 'custom', couponId: input.couponId, analyticsMetadata: input.analyticsMetadata, customerEmail: input.customerEmail, returnUrl: input.returnUrl, userId: input.userId, anonymousUserId: input.anonymousUserId, idempotencyKey: input.idempotencyKey, environment: input.environment }));

package/dist/services/funnel-sdk.service.d.ts

@@ -152,6 +152,12 @@ export type FunnelSdkCreateSubscriptionCheckoutResponse = {
 };
 export type FunnelSdkCreateOneTimeCheckoutInput = {
     planId: string;
+    planKey?: string | null;
+    paymentProfileId?: string | null;
+    provider?: 'stripe' | null;
+    runtimeConfigRevisionId?: string | null;
+    anonymousUserId?: string | null;
+    idempotencyKey?: string | null;
     offerSetId?: string | null;
     offerSetKey?: string | null;
     amountCents: number;
@@ -240,6 +246,11 @@ export type FunnelSdkCreateOneTimePaymentIntentResponse = {
 };
 export type FunnelSdkChargeOneClickPaymentInput = {
     planId: string;
+    planKey?: string | null;
+    offerSetId?: string | null;
+    paymentProfileId?: string | null;
+    provider?: 'stripe' | null;
+    runtimeConfigRevisionId?: string | null;
     providerPlanId?: string | null;
     amountCents: number;
     analyticsMetadata?: Record<string, unknown> | null;

package/dist/services/funnel-sdk.service.js

@@ -1,6 +1,7 @@
 import { buildMainApiUrl, FUNNEL_ID, FUNNEL_SDK_PUBLISHABLE_KEY, FUNNEL_VERSION_ID, } from './runtime-api.config.js';
 import { resolvePreviewPaymentPublishableKey } from './public-env.js';
 import { CURRENT_STEP_CONTRACT_VERSION } from '../steps/step-contract.js';
+import { toV2CheckoutSelection, toV2CheckoutSessionRequest } from './funnel-sdk-payments.functions.js';
 const trimTrailingSlash = (value) => value.replace(/\/+$/, '');
 const toNormalizedPath = (path) => (path.startsWith('/') ? path : `/${path}`);
 const asTrimmedStringOrNull = (value) => {
@@ -263,39 +264,9 @@ class FunnelSdkService {
     async createSubscriptionCheckout(input) {
         const { paymentsApiVersion } = resolveRuntimeConfig(input.runtimeConfig);
         if (paymentsApiVersion === 'v2') {
-            const runtimeConfigRevisionId = asTrimmedStringOrNull(input.runtimeConfigRevisionId);
-            const offerSetId = asTrimmedStringOrNull(input.offerSetId);
-            const paymentProfileId = asTrimmedStringOrNull(input.paymentProfileId);
-            const providerPlanId = asTrimmedStringOrNull(input.providerPlanId);
-            const planKey = asTrimmedStringOrNull(input.planKey) || asTrimmedStringOrNull(input.planId);
-            if (!runtimeConfigRevisionId
-                || !offerSetId
-                || !paymentProfileId
-                || !providerPlanId
-                || !planKey
-                || input.provider !== 'stripe') {
-                throw new Error('Published Stripe checkout selection is incomplete');
-            }
             return this.postJson('/sdk/public/v2/payments/checkout-sessions', {
                 runtimeConfig: input.runtimeConfig,
-                body: {
-                    runtimeConfigRevisionId,
-                    offerSetId,
-                    paymentProfileId,
-                    provider: 'stripe',
-                    providerPlanId,
-                    planKey,
-                    checkoutType: 'subscription',
-                    uiMode: 'custom',
-                    couponId: input.couponId,
-                    analyticsMetadata: input.analyticsMetadata,
-                    customerEmail: input.customerEmail,
-                    returnUrl: input.returnUrl,
-                    userId: input.userId,
-                    anonymousUserId: input.anonymousUserId,
-                    idempotencyKey: input.idempotencyKey,
-                    environment: input.environment,
-                },
+                body: toV2CheckoutSessionRequest(input, 'subscription'),
                 errorMessage: 'Unable to create subscription checkout',
             });
         }
@@ -329,6 +300,13 @@ class FunnelSdkService {
         });
     }
     async createOneTimeCheckout(input) {
+        if (resolveRuntimeConfig(input.runtimeConfig).paymentsApiVersion === 'v2') {
+            return this.postJson('/sdk/public/v2/payments/checkout-sessions', {
+                runtimeConfig: input.runtimeConfig,
+                body: toV2CheckoutSessionRequest(input, 'one_time'),
+                errorMessage: 'Unable to create one-time checkout',
+            });
+        }
         return this.postJson('/sdk/public/payments/one-time-checkout', {
             runtimeConfig: input.runtimeConfig,
             body: {
@@ -352,32 +330,9 @@ class FunnelSdkService {
     async updateSubscriptionCheckoutPlan(input) {
         const { paymentsApiVersion } = resolveRuntimeConfig(input.runtimeConfig);
         if (paymentsApiVersion === 'v2') {
-            const runtimeConfigRevisionId = asTrimmedStringOrNull(input.runtimeConfigRevisionId);
-            const offerSetId = asTrimmedStringOrNull(input.offerSetId);
-            const paymentProfileId = asTrimmedStringOrNull(input.paymentProfileId);
-            const providerPlanId = asTrimmedStringOrNull(input.providerPlanId);
-            const planKey = asTrimmedStringOrNull(input.planKey) || asTrimmedStringOrNull(input.planId);
-            if (!runtimeConfigRevisionId
-                || !offerSetId
-                || !paymentProfileId
-                || !providerPlanId
-                || !planKey
-                || input.provider !== 'stripe') {
-                throw new Error('Published Stripe checkout selection is incomplete');
-            }
             return this.patchJson(`/sdk/public/v2/payments/checkout-sessions/${encodeURIComponent(input.checkoutSessionId)}`, {
                 runtimeConfig: input.runtimeConfig,
-                body: {
-                    runtimeConfigRevisionId,
-                    offerSetId,
-                    paymentProfileId,
-                    provider: 'stripe',
-                    providerPlanId,
-                    planKey,
-                    couponId: input.couponId,
-                    analyticsMetadata: input.analyticsMetadata,
-                    environment: input.environment,
-                },
+                body: Object.assign(Object.assign({}, toV2CheckoutSelection(input)), { couponId: input.couponId, analyticsMetadata: input.analyticsMetadata, environment: input.environment }),
                 errorMessage: 'Unable to update subscription checkout',
             });
         }
@@ -441,6 +396,18 @@ class FunnelSdkService {
         });
     }
     async chargeOneClickPayment(input) {
+        var _a, _b, _c;
+        if (resolveRuntimeConfig(input.runtimeConfig).paymentsApiVersion === 'v2') {
+            const selection = toV2CheckoutSelection(input);
+            if (!((_a = input.checkoutSessionId) === null || _a === void 0 ? void 0 : _a.trim()) || !((_b = input.userId) === null || _b === void 0 ? void 0 : _b.trim()) || !((_c = input.idempotencyKey) === null || _c === void 0 ? void 0 : _c.trim())) {
+                throw new Error('V2 one-click requires checkoutSessionId, userId and idempotencyKey');
+            }
+            return this.postJson('/sdk/public/v2/payments/one-click', {
+                runtimeConfig: input.runtimeConfig,
+                body: Object.assign(Object.assign({}, selection), { checkoutSessionId: input.checkoutSessionId, userId: input.userId, idempotencyKey: input.idempotencyKey, analyticsMetadata: input.analyticsMetadata, environment: input.environment }),
+                errorMessage: 'Unable to charge one-click payment',
+            });
+        }
         return this.postJson('/sdk/public/payments/one-click', {
             runtimeConfig: input.runtimeConfig,
             body: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/runtime",
-  "version": "0.10.0",
+  "version": "0.11.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/The-Solid-Grove/funnelsgrove.git",