From a115e37535a08c1d126fc9d3f1aa04aca2e164e7 Mon Sep 17 00:00:00 2001
From: giancarlo <giancarlopsk@gmail.com>
Date: Tue, 21 May 2024 20:41:41 +0700
Subject: [PATCH] Update error handling and function calls in billing services

Minor modifications made to the billing service handlers to improve data interpretation and error processing. The 'getLineItemTypeById' function now uses 'item.variant' for more accurate line item type identification. Unnecessary 'Crypto' object instantiation has been removed in 'createHmac', while improved formatting applied to the error logging within the billing webhook.
---
 apps/web/app/api/billing/webhook/route.ts                       | 2 +-
 .../src/services/lemon-squeezy-webhook-handler.service.ts       | 2 +-
 packages/billing/lemon-squeezy/src/services/verify-hmac.ts      | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/web/app/api/billing/webhook/route.ts b/apps/web/app/api/billing/webhook/route.ts
index aef993b06..814cf44aa 100644
--- a/apps/web/app/api/billing/webhook/route.ts
+++ b/apps/web/app/api/billing/webhook/route.ts
@@ -36,7 +36,7 @@ export const POST = enhanceRouteHandler(
 
       return new Response('OK', { status: 200 });
     } catch (error) {
-      logger.error(ctx, `Failed to process billing webhook`, error);
+      logger.error({ ...ctx, error }, `Failed to process billing webhook`);
 
       return new Response('Failed to process billing webhook', {
         status: 500,
diff --git a/packages/billing/lemon-squeezy/src/services/lemon-squeezy-webhook-handler.service.ts b/packages/billing/lemon-squeezy/src/services/lemon-squeezy-webhook-handler.service.ts
index 2e27a3fdc..bd9810667 100644
--- a/packages/billing/lemon-squeezy/src/services/lemon-squeezy-webhook-handler.service.ts
+++ b/packages/billing/lemon-squeezy/src/services/lemon-squeezy-webhook-handler.service.ts
@@ -345,7 +345,7 @@ export class LemonSqueezyWebhookHandlerService
         product_id: item.product,
         variant_id: item.variant,
         price_amount: item.priceAmount,
-        type: getLineItemTypeById(this.config, item.id),
+        type: getLineItemTypeById(this.config, item.variant),
       };
     });
 
diff --git a/packages/billing/lemon-squeezy/src/services/verify-hmac.ts b/packages/billing/lemon-squeezy/src/services/verify-hmac.ts
index d712ea175..cdf205869 100644
--- a/packages/billing/lemon-squeezy/src/services/verify-hmac.ts
+++ b/packages/billing/lemon-squeezy/src/services/verify-hmac.ts
@@ -6,7 +6,6 @@ function bufferToHex(buffer: ArrayBuffer) {
 
 export async function createHmac({ key, data }: { key: string; data: string }) {
   const encoder = new TextEncoder();
-  const crypto = new Crypto();
   const encodedKey = encoder.encode(key);
   const encodedData = encoder.encode(data);