Refactor logger usage and add discount field to checkout

This commit refactors the logger usage in various files to make it more streamlined and consistent. It also introduces a new 'enableDiscountField' feature for the checkout that can be toggled on specific products. This allows customers to apply discounts at checkout if the product or subscription plan has the 'enableDiscountField' set to true.

packages/billing/core/src/create-billing-schema.ts

@@ -167,7 +167,18 @@ const ProductSchema = z
           'Badge for the product. Displayed to the user. Example: "Popular"',
       })
       .optional(),
-    features: z.array(z.string()).nonempty(),
+    features: z
+      .array(
+        z.string({
+          description: 'Features of the product. Displayed to the user.',
+        }),
+      )
+      .nonempty(),
+    enableDiscountField: z
+      .boolean({
+        description: 'Enable discount field for the product in the checkout.',
+      })
+      .optional(),
     highlighted: z
       .boolean({
         description: 'Highlight this product. Displayed to the user.',

packages/billing/core/src/schema/create-billing-checkout.schema.ts

@@ -9,6 +9,7 @@ export const CreateBillingCheckoutSchema = z.object({
   trialDays: z.number().optional(),
   customerId: z.string().optional(),
   customerEmail: z.string().email().optional(),
+  enableDiscountField: z.boolean().optional(),
   variantQuantities: z.array(
     z.object({
       variantId: z.string().min(1),

packages/billing/gateway/src/components/plan-picker.tsx

@@ -153,6 +153,10 @@ export function PlanPicker(
                                   id={interval}
                                   value={interval}
                                   onClick={() => {
+                                    form.setValue('interval', interval, {
+                                      shouldValidate: true,
+                                    });
+
                                     if (selectedProduct) {
                                       const plan = selectedProduct.plans.find(
                                         (item) => item.interval === interval,
@@ -160,12 +164,10 @@ export function PlanPicker(
 
                                       form.setValue('planId', plan?.id ?? '', {
                                         shouldValidate: true,
+                                        shouldDirty: true,
+                                        shouldTouch: true,
                                       });
                                     }
-
-                                    form.setValue('interval', interval, {
-                                      shouldValidate: true,
-                                    });
                                   }}
                                 />
 
@@ -202,7 +204,7 @@ export function PlanPicker(
                 </FormLabel>
 
                 <FormControl>
-                  <RadioGroup name={field.name}>
+                  <RadioGroup value={field.value} name={field.name}>
                     {props.config.products.map((product) => {
                       const plan = product.plans.find((item) => {
                         if (item.paymentType === 'one-time') {
@@ -216,9 +218,12 @@ export function PlanPicker(
                         return null;
                       }
 
+                      const planId = plan.id;
+                      const selected = field.value === planId;
+
                       const primaryLineItem = getPrimaryLineItem(
                         props.config,
-                        plan.id,
+                        planId,
                       );
 
                       if (!primaryLineItem) {
@@ -227,14 +232,19 @@ export function PlanPicker(
 
                       return (
                         <RadioGroupItemLabel
-                          selected={field.value === plan.id}
-                          key={plan.id}
+                          selected={selected}
+                          key={primaryLineItem.id}
                         >
                           <RadioGroupItem
+                            key={plan.id + selected}
                             id={plan.id}
                             value={plan.id}
                             onClick={() => {
-                              form.setValue('planId', plan.id, {
+                              if (selected) {
+                                return;
+                              }
+
+                              form.setValue('planId', planId, {
                                 shouldValidate: true,
                               });
 

packages/billing/lemon-squeezy/src/services/create-lemon-squeezy-checkout.ts

@@ -52,6 +52,7 @@ export async function createLemonSqueezyCheckout(
       embed: true,
       media: true,
       logo: true,
+      discount: params.enableDiscountField ?? false,
     },
     checkoutData: {
       email: customerEmail,

packages/billing/stripe/src/services/create-stripe-checkout.ts

@@ -76,6 +76,7 @@ export async function createStripeCheckout(
 
   return stripe.checkout.sessions.create({
     mode,
+    allow_promotion_codes: params.enableDiscountField,
     ui_mode: uiMode,
     line_items: lineItems,
     client_reference_id: clientReferenceId,

packages/billing/stripe/src/services/stripe-billing-strategy.service.ts

@@ -21,44 +21,31 @@ import { createStripeClient } from './stripe-sdk';
 export class StripeBillingStrategyService
   implements BillingStrategyProviderService
 {
+  private readonly namespace = 'billing.stripe';
+
   async createCheckoutSession(
     params: z.infer<typeof CreateBillingCheckoutSchema>,
   ) {
     const stripe = await this.stripeProvider();
     const logger = await getLogger();
 
-    logger.info(
-      {
-        name: 'billing.stripe',
-        customerId: params.customerId,
-        accountId: params.accountId,
-      },
-      'Creating checkout session...',
-    );
+    const ctx = {
+      name: this.namespace,
+      customerId: params.customerId,
+      accountId: params.accountId,
+    };
+
+    logger.info(ctx, 'Creating checkout session...');
 
     const { client_secret } = await createStripeCheckout(stripe, params);
 
     if (!client_secret) {
-      logger.error(
-        {
-          name: 'billing.stripe',
-          customerId: params.customerId,
-          accountId: params.accountId,
-        },
-        'Failed to create checkout session',
-      );
+      logger.error(ctx, 'Failed to create checkout session');
 
       throw new Error('Failed to create checkout session');
     }
 
-    logger.info(
-      {
-        name: 'billing.stripe',
-        customerId: params.customerId,
-        accountId: params.accountId,
-      },
-      'Checkout session created successfully',
-    );
+    logger.info(ctx, 'Checkout session created successfully');
 
     return { checkoutToken: client_secret };
   }
@@ -69,32 +56,19 @@ export class StripeBillingStrategyService
     const stripe = await this.stripeProvider();
     const logger = await getLogger();
 
-    logger.info(
-      {
-        name: 'billing.stripe',
-        customerId: params.customerId,
-      },
-      'Creating billing portal session...',
-    );
+    const ctx = {
+      name: this.namespace,
+      customerId: params.customerId,
+    };
+
+    logger.info(ctx, 'Creating billing portal session...');
 
     const session = await createStripeBillingPortalSession(stripe, params);
 
     if (!session?.url) {
-      logger.error(
-        {
-          name: 'billing.stripe',
-          customerId: params.customerId,
-        },
-        'Failed to create billing portal session',
-      );
+      logger.error(ctx, 'Failed to create billing portal session');
     } else {
-      logger.info(
-        {
-          name: 'billing.stripe',
-          customerId: params.customerId,
-        },
-        'Billing portal session created successfully',
-      );
+      logger.info(ctx, 'Billing portal session created successfully');
     }
 
     return session;
@@ -106,34 +80,26 @@ export class StripeBillingStrategyService
     const stripe = await this.stripeProvider();
     const logger = await getLogger();
 
-    logger.info(
-      {
-        name: 'billing.stripe',
-        subscriptionId: params.subscriptionId,
-      },
-      'Cancelling subscription...',
-    );
+    const ctx = {
+      name: this.namespace,
+      subscriptionId: params.subscriptionId,
+    };
+
+    logger.info(ctx, 'Cancelling subscription...');
 
     try {
       await stripe.subscriptions.cancel(params.subscriptionId, {
         invoice_now: params.invoiceNow ?? true,
       });
 
-      logger.info(
-        {
-          name: 'billing.stripe',
-          subscriptionId: params.subscriptionId,
-        },
-        'Subscription cancelled successfully',
-      );
+      logger.info(ctx, 'Subscription cancelled successfully');
 
       return { success: true };
-    } catch (e) {
+    } catch (error) {
       logger.error(
         {
-          name: 'billing.stripe',
-          subscriptionId: params.subscriptionId,
-          error: e,
+          ...ctx,
+          error,
         },
         'Failed to cancel subscription',
       );
@@ -148,25 +114,18 @@ export class StripeBillingStrategyService
     const stripe = await this.stripeProvider();
     const logger = await getLogger();
 
-    logger.info(
-      {
-        name: 'billing.stripe',
-        sessionId: params.sessionId,
-      },
-      'Retrieving checkout session...',
-    );
+    const ctx = {
+      name: this.namespace,
+      sessionId: params.sessionId,
+    };
+
+    logger.info(ctx, 'Retrieving checkout session...');
 
     try {
       const session = await stripe.checkout.sessions.retrieve(params.sessionId);
       const isSessionOpen = session.status === 'open';
 
-      logger.info(
-        {
-          name: 'billing.stripe',
-          sessionId: params.sessionId,
-        },
-        'Checkout session retrieved successfully',
-      );
+      logger.info(ctx, 'Checkout session retrieved successfully');
 
       return {
         checkoutToken: session.client_secret,
@@ -179,8 +138,7 @@ export class StripeBillingStrategyService
     } catch (error) {
       logger.error(
         {
-          name: 'billing.stripe',
-          sessionId: params.sessionId,
+          ...ctx,
           error,
         },
         'Failed to retrieve checkout session',
@@ -192,14 +150,35 @@ export class StripeBillingStrategyService
 
   async reportUsage(params: z.infer<typeof ReportBillingUsageSchema>) {
     const stripe = await this.stripeProvider();
+    const logger = await getLogger();
 
-    await stripe.subscriptionItems.createUsageRecord(
-      params.subscriptionItemId,
-      {
-        quantity: params.usage.quantity,
-        action: params.usage.action,
-      },
-    );
+    const ctx = {
+      name: this.namespace,
+      subscriptionItemId: params.subscriptionItemId,
+      usage: params.usage,
+    };
+
+    logger.info(ctx, 'Reporting usage...');
+
+    try {
+      await stripe.subscriptionItems.createUsageRecord(
+        params.subscriptionItemId,
+        {
+          quantity: params.usage.quantity,
+          action: params.usage.action,
+        },
+      );
+    } catch (error) {
+      logger.error(
+        {
+          ...ctx,
+          error,
+        },
+        'Failed to report usage',
+      );
+
+      throw new Error('Failed to report usage');
+    }
 
     return { success: true };
   }
@@ -210,13 +189,14 @@ export class StripeBillingStrategyService
     const stripe = await this.stripeProvider();
     const logger = await getLogger();
 
-    logger.info(
-      {
-        name: 'billing.stripe',
-        ...params,
-      },
-      'Updating subscription...',
-    );
+    const ctx = {
+      name: this.namespace,
+      subscriptionId: params.subscriptionId,
+      subscriptionItemId: params.subscriptionItemId,
+      quantity: params.quantity,
+    };
+
+    logger.info(ctx, 'Updating subscription...');
 
     try {
       await stripe.subscriptions.update(params.subscriptionId, {
@@ -228,24 +208,11 @@ export class StripeBillingStrategyService
         ],
       });
 
-      logger.info(
-        {
-          name: 'billing.stripe',
-          ...params,
-        },
-        'Subscription updated successfully',
-      );
+      logger.info(ctx, 'Subscription updated successfully');
 
       return { success: true };
-    } catch (e) {
-      logger.error(
-        {
-          name: 'billing.stripe',
-          ...params,
-          error: e,
-        },
-        'Failed to update subscription',
-      );
+    } catch (error) {
+      logger.error({ ...ctx, error }, 'Failed to update subscription');
 
       throw new Error('Failed to update subscription');
     }

packages/features/accounts/src/components/personal-account-settings/mfa/multi-factor-auth-list.tsx

@@ -85,7 +85,7 @@ export function MultiFactorAuthFactorsList() {
   if (!allFactors.length) {
     return (
       <div className={'flex flex-col space-y-4'}>
-        <Alert variant={'info'}>
+        <Alert>
           <ShieldCheck className={'h-4'} />
 
           <AlertTitle>