@funnelsgrove/payments 0.15.6 → 0.15.8

package/dist/providers/stripe/services/checkoutCompletionAnalytics.service.js

@@ -10,7 +10,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { publicAnalyticsSdk, } from '@funnelsgrove/analytics';
-import { verifyStripeSubscriptionCheckoutPayment, } from './stripe.service.js';
+import { verifyStripeSubscriptionCheckoutPayment } from './checkout/verifySubscriptionCheckoutPayment.js';
 import { toAnalyticsPaymentMethod } from '../../../services/paymentMethodAnalytics.service.js';
 const asRecord = (value) => {
     return value && typeof value === 'object' && !Array.isArray(value)
@@ -175,3 +175,41 @@ export async function trackPaidStripeSubscriptionCheckoutCompleted(input) {
         activeCheckoutCompletionKeys.delete(completionKey);
     }
 }
+export async function trackPaidStripeOneClickPaymentCompleted(input, payment) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    const context = input.checkoutAnalytics;
+    const paymentIntentId = (_a = payment.paymentIntentId) === null || _a === void 0 ? void 0 : _a.trim();
+    if (!context || payment.status !== 'succeeded' || !paymentIntentId) {
+        return;
+    }
+    const runtimeConfig = (_b = input.runtimeConfig) !== null && _b !== void 0 ? _b : context.runtimeConfig;
+    const completionKey = buildCheckoutStorageKey('checkout_completed', paymentIntentId, runtimeConfig);
+    if (activeCheckoutCompletionKeys.has(completionKey)
+        || hasTrackedCheckoutSession('checkout_completed', paymentIntentId, runtimeConfig)) {
+        return;
+    }
+    activeCheckoutCompletionKeys.add(completionKey);
+    try {
+        const userId = ((_c = input.userId) === null || _c === void 0 ? void 0 : _c.trim()) || ((_d = input.user_id) === null || _d === void 0 ? void 0 : _d.trim());
+        const environment = (_f = (_e = payment.environment) !== null && _e !== void 0 ? _e : input.environment) !== null && _f !== void 0 ? _f : context.environment;
+        const eventId = publicAnalyticsSdk.trackCheckoutCompleted({
+            eventId: paymentIntentId,
+            userId,
+            environment,
+            stepId: context.stepId,
+            stepName: context.stepName,
+            stepType: context.stepType,
+            stepContractVersion: context.stepContractVersion,
+            featureFlags: context.featureFlags,
+            metadata: Object.assign(Object.assign(Object.assign({}, asRecord(input.analyticsMetadata)), asRecord(context.metadata)), { userId,
+                environment, amountCents: (_g = payment.amountCents) !== null && _g !== void 0 ? _g : input.amountCents, currency: (_j = (_h = payment.currency) !== null && _h !== void 0 ? _h : input.currency) !== null && _j !== void 0 ? _j : 'usd', planId: input.planId, providerPlanId: input.providerPlanId, payment_provider: 'stripe' }),
+        });
+        if (eventId) {
+            markCheckoutSessionTracked('checkout_completed', paymentIntentId, runtimeConfig);
+            await publicAnalyticsSdk.flush().catch(() => 0);
+        }
+    }
+    finally {
+        activeCheckoutCompletionKeys.delete(completionKey);
+    }
+}

package/dist/providers/stripe/services/oneClick/completePayment.js

@@ -1,13 +1,18 @@
 import { chargeStripeOneClickPayment } from './chargePayment.js';
 import { confirmOneClickPayment } from './confirmation.js';
+import { trackPaidStripeOneClickPaymentCompleted } from '../checkoutCompletionAnalytics.service.js';
 export const requiresStripeOneClickConfirmation = (status) => {
     return status === 'requires_action' || status === 'requires_confirmation';
 };
 export async function completeStripeOneClickPayment(input) {
     const payment = await chargeStripeOneClickPayment(input);
-    if (!requiresStripeOneClickConfirmation(payment.status)) {
-        return Object.assign(Object.assign({}, payment), { confirmationAttempted: false });
+    const confirmationAttempted = requiresStripeOneClickConfirmation(payment.status);
+    const result = Object.assign(Object.assign({}, payment), { status: confirmationAttempted ? await confirmOneClickPayment(payment, input) : payment.status, confirmationAttempted });
+    try {
+        await trackPaidStripeOneClickPaymentCompleted(input, result);
     }
-    const status = await confirmOneClickPayment(payment, input);
-    return Object.assign(Object.assign({}, payment), { status, confirmationAttempted: true });
+    catch (_a) {
+        // Analytics cannot turn a successful charge into a payment retry.
+    }
+    return result;
 }

package/dist/providers/stripe/services/oneClick/types.d.ts

@@ -1,5 +1,6 @@
 import type { RuntimeMode } from '@funnelsgrove/runtime';
 import type { StripeRuntimeConfigOverrides } from '../shared/types.js';
+import type { StripeSubscriptionCheckoutAnalyticsContext } from '../checkoutCompletionAnalytics.service.js';
 export type ChargeOneClickPaymentInput = {
     planId: string;
     planKey?: string | null;
@@ -34,6 +35,7 @@ export type ChargeOneClickPaymentResponse = {
 };
 export type CompleteStripeOneClickPaymentInput = ChargeOneClickPaymentInput & {
     returnUrl: string;
+    checkoutAnalytics?: StripeSubscriptionCheckoutAnalyticsContext;
 };
 export type CompleteStripeOneClickPaymentResponse = ChargeOneClickPaymentResponse & {
     confirmationAttempted: boolean;

package/dist/services/checkoutEmail.d.ts

@@ -0,0 +1,3 @@
+export declare const isValidCheckoutEmail: (value?: string | null) => boolean;
+export declare const isCheckoutEmailError: (error: unknown) => boolean;
+export declare const normalizeCheckoutEmailResult: (result: string | null | void, submittedEmail: string, invalidMessage?: string) => string;

package/dist/services/checkoutEmail.js

@@ -0,0 +1,20 @@
+export const isValidCheckoutEmail = (value) => { var _a; return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test((_a = value === null || value === void 0 ? void 0 : value.trim()) !== null && _a !== void 0 ? _a : ''); };
+export const isCheckoutEmailError = (error) => {
+    const record = error && typeof error === 'object'
+        ? error
+        : null;
+    if ((record === null || record === void 0 ? void 0 : record.code) === 'email_invalid' || (record === null || record === void 0 ? void 0 : record.code) === 'stripe_email_invalid') {
+        return true;
+    }
+    const message = typeof error === 'string' ? error : record === null || record === void 0 ? void 0 : record.message;
+    return typeof message === 'string'
+        && /(?:invalid email|valid email address|email (?:address )?is (?:invalid|required))/i.test(message);
+};
+export const normalizeCheckoutEmailResult = (result, submittedEmail, invalidMessage = 'Enter a valid email address.') => {
+    if (result === null)
+        throw new Error('Unable to save your email. Please try again.');
+    const email = typeof result === 'string' ? result.trim() : submittedEmail.trim();
+    if (!isValidCheckoutEmail(email))
+        throw new Error(invalidMessage);
+    return email;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funnelsgrove/payments",
-  "version": "0.15.6",
+  "version": "0.15.8",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/The-Solid-Grove/funnelsgrove.git",
@@ -32,7 +32,7 @@
     "test:run": "vitest run --passWithNoTests"
   },
   "dependencies": {
-    "@funnelsgrove/analytics": "0.1.103",
+    "@funnelsgrove/analytics": "0.1.104",
     "@funnelsgrove/runtime": "0.14.2",
     "@solidgate/react-sdk": "1.34.0",
     "@stripe/react-stripe-js": "^5.6.0",