@funnelsgrove/payments 0.11.9 → 0.11.10

package/dist/providers/solidgate/components/SolidgateCheckoutDialog.js

@@ -211,14 +211,18 @@ export function SolidgateCheckoutDialog({ open, request, customerEmail, checkout
         setCommittedEmail(normalizedCustomerEmail);
         setEmailError(null);
     }, [customerEmail, normalizedCustomerEmail]);
-    const { discountKeyOrProviderId, failUrl, funnelPlanKey, funnelEndUserId, funnelId, idempotencyKey, offerSetId, returnUrl, runtimeConfig, successUrl, } = request;
-    const { apiBaseUrl, funnelId: runtimeFunnelId, funnelSdkPublishableKey, funnelVersionId, } = runtimeConfig || {};
+    const { discountKeyOrProviderId, failUrl, funnelPlanKey, paymentProfileId, providerPlanId, checkoutType, environment, funnelEndUserId, funnelId, idempotencyKey, offerSetId, returnUrl, runtimeConfig, successUrl, } = request;
+    const { apiBaseUrl, funnelId: runtimeFunnelId, funnelSdkPublishableKey, funnelVersionId, paymentsApiVersion, } = runtimeConfig || {};
     const hasRuntimeConfig = runtimeConfig !== undefined;
     const normalizedRequest = useMemo(() => ({
         funnelId: (funnelId === null || funnelId === void 0 ? void 0 : funnelId.trim()) || null,
         funnelEndUserId: funnelEndUserId.trim(),
         offerSetId: offerSetId.trim(),
         funnelPlanKey: funnelPlanKey.trim(),
+        paymentProfileId: (paymentProfileId === null || paymentProfileId === void 0 ? void 0 : paymentProfileId.trim()) || null,
+        providerPlanId: (providerPlanId === null || providerPlanId === void 0 ? void 0 : providerPlanId.trim()) || null,
+        checkoutType: checkoutType || null,
+        environment: environment || null,
         idempotencyKey: idempotencyKey.trim(),
         discountKeyOrProviderId: (discountKeyOrProviderId === null || discountKeyOrProviderId === void 0 ? void 0 : discountKeyOrProviderId.trim()) || null,
         returnUrl: returnUrl.trim(),
@@ -229,16 +233,22 @@ export function SolidgateCheckoutDialog({ open, request, customerEmail, checkout
             funnelId: (runtimeFunnelId === null || runtimeFunnelId === void 0 ? void 0 : runtimeFunnelId.trim()) || null,
             funnelVersionId: (funnelVersionId === null || funnelVersionId === void 0 ? void 0 : funnelVersionId.trim()) || null,
             funnelSdkPublishableKey: (funnelSdkPublishableKey === null || funnelSdkPublishableKey === void 0 ? void 0 : funnelSdkPublishableKey.trim()) || null,
+            paymentsApiVersion: paymentsApiVersion || null,
         } : undefined,
     }), [
         apiBaseUrl,
         discountKeyOrProviderId,
         failUrl,
         funnelPlanKey,
+        paymentProfileId,
+        providerPlanId,
+        checkoutType,
+        environment,
         funnelEndUserId,
         funnelId,
         funnelSdkPublishableKey,
         funnelVersionId,
+        paymentsApiVersion,
         idempotencyKey,
         offerSetId,
         returnUrl,

package/dist/providers/solidgate/services/solidgate.service.d.ts

@@ -26,6 +26,10 @@ export type PrepareSolidgateCheckoutInput = {
     funnelEndUserId: string;
     offerSetId: string;
     funnelPlanKey: string;
+    paymentProfileId?: string | null;
+    providerPlanId?: string | null;
+    checkoutType?: 'subscription' | 'one_time' | null;
+    environment?: 'test' | 'live' | null;
     idempotencyKey: string;
     discountKeyOrProviderId?: string | null;
     returnUrl: string;

package/dist/providers/solidgate/services/solidgate.service.js

@@ -32,6 +32,18 @@ const postJson = async (path, body, runtimeConfig, signal) => {
     }
     return response.json();
 };
+const getJson = async (path, runtimeConfig, signal) => {
+    const publishableKey = resolvePublishableKey(runtimeConfig);
+    const response = await fetch(resolveApiUrl(path, runtimeConfig), {
+        method: 'GET',
+        headers: Object.assign({}, (publishableKey ? { 'x-sdk-publishable-key': publishableKey } : {})),
+        signal,
+    });
+    if (!response.ok) {
+        throw new Error('Solidgate checkout is temporarily unavailable');
+    }
+    return response.json();
+};
 const isRecord = (value) => (Boolean(value) && typeof value === 'object' && !Array.isArray(value));
 const parsePreparation = (value) => {
     if (!isRecord(value) || !isRecord(value.display) || !isRecord(value.initialization)) {
@@ -98,26 +110,40 @@ const parseStatus = (value) => {
     };
 };
 export const prepareSolidgateCheckout = async (input) => {
-    var _a;
-    return parsePreparation(await postJson('/sdk/public/payments/solidgate/checkout', {
-        funnelId: resolveFunnelId(input.funnelId, input.runtimeConfig),
-        funnelEndUserId: requiredString(input.funnelEndUserId, 'funnelEndUserId'),
-        offerSetId: requiredString(input.offerSetId, 'offerSetId'),
-        funnelPlanKey: requiredString(input.funnelPlanKey, 'funnelPlanKey'),
-        idempotencyKey: requiredString(input.idempotencyKey, 'idempotencyKey'),
-        discountKeyOrProviderId: ((_a = input.discountKeyOrProviderId) === null || _a === void 0 ? void 0 : _a.trim()) || null,
-        returnUrl: requiredString(input.returnUrl, 'returnUrl'),
-        successUrl: requiredString(input.successUrl, 'successUrl'),
-        failUrl: requiredString(input.failUrl, 'failUrl'),
-    }, input.runtimeConfig, input.signal));
+    var _a, _b, _c, _d;
+    const useV2 = ((_a = input.runtimeConfig) === null || _a === void 0 ? void 0 : _a.paymentsApiVersion) === 'v2';
+    const paymentProfileId = ((_b = input.paymentProfileId) === null || _b === void 0 ? void 0 : _b.trim()) || null;
+    const providerPlanId = ((_c = input.providerPlanId) === null || _c === void 0 ? void 0 : _c.trim()) || null;
+    const checkoutType = input.checkoutType || null;
+    const environment = input.environment || null;
+    if (useV2 && (!paymentProfileId || !providerPlanId || !checkoutType || !environment)) {
+        throw new Error('Solidgate V2 checkout selection is incomplete');
+    }
+    return parsePreparation(await postJson(useV2
+        ? '/sdk/public/v2/payments/checkout-sessions'
+        : '/sdk/public/payments/solidgate/checkout', Object.assign(Object.assign({}, (useV2 ? {
+        checkoutType,
+        uiMode: 'custom',
+        environment,
+        paymentProfileId,
+        provider: 'solidgate',
+        providerPlanId,
+        planKey: requiredString(input.funnelPlanKey, 'funnelPlanKey'),
+    } : {})), { funnelId: resolveFunnelId(input.funnelId, input.runtimeConfig), funnelEndUserId: requiredString(input.funnelEndUserId, 'funnelEndUserId'), offerSetId: requiredString(input.offerSetId, 'offerSetId'), funnelPlanKey: requiredString(input.funnelPlanKey, 'funnelPlanKey'), idempotencyKey: requiredString(input.idempotencyKey, 'idempotencyKey'), discountKeyOrProviderId: ((_d = input.discountKeyOrProviderId) === null || _d === void 0 ? void 0 : _d.trim()) || null, returnUrl: requiredString(input.returnUrl, 'returnUrl'), successUrl: requiredString(input.successUrl, 'successUrl'), failUrl: requiredString(input.failUrl, 'failUrl') }), input.runtimeConfig, input.signal));
 };
 export const retrieveSolidgateCheckoutStatus = async (input) => {
+    var _a;
     const attemptId = requiredString(input.attemptId, 'attemptId');
-    const result = parseStatus(await postJson('/sdk/public/payments/solidgate/checkout/status', {
-        funnelId: resolveFunnelId(input.funnelId, input.runtimeConfig),
-        funnelEndUserId: requiredString(input.funnelEndUserId, 'funnelEndUserId'),
-        attemptId,
-    }, input.runtimeConfig, input.signal));
+    const useV2 = ((_a = input.runtimeConfig) === null || _a === void 0 ? void 0 : _a.paymentsApiVersion) === 'v2';
+    const funnelId = resolveFunnelId(input.funnelId, input.runtimeConfig);
+    const funnelEndUserId = requiredString(input.funnelEndUserId, 'funnelEndUserId');
+    const result = parseStatus(await (useV2
+        ? getJson(`/sdk/public/v2/payments/checkout-sessions/${encodeURIComponent(attemptId)}?provider=solidgate&funnelId=${encodeURIComponent(funnelId)}&funnelEndUserId=${encodeURIComponent(funnelEndUserId)}`, input.runtimeConfig, input.signal)
+        : postJson('/sdk/public/payments/solidgate/checkout/status', {
+            funnelId: resolveFunnelId(input.funnelId, input.runtimeConfig),
+            funnelEndUserId,
+            attemptId,
+        }, input.runtimeConfig, input.signal)));
     if (result.attemptId !== attemptId) {
         throw new Error('Solidgate checkout status returned the wrong attempt');
     }

package/package.json

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