From fd618bad21b521626164a76035f2dcbd52e1b35c Mon Sep 17 00:00:00 2001
From: MinhhTien <92145479+MinhhTien@users.noreply.github.com>
Date: Sun, 5 May 2024 23:03:26 +0700
Subject: [PATCH] feature/payment: update webhook for verify url

---
 package-lock.json                             |  4 +++-
 src/main.ts                                   |  2 +-
 src/payment/controllers/payment.controller.ts | 10 +++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c1bed16..a2aebd5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2576,6 +2576,7 @@
       "version": "8.2.10",
       "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-8.2.10.tgz",
       "integrity": "sha512-IdD5NmHyVjWM8SHWo/kPBgtzXatwPkfwzyP3fN1jF2g9BWt5WO+8hL2F4o2GKIYsU40PpqeevuUWvkS/roXJkA==",
+      "dev": true,
       "dependencies": {
         "@types/through": "*",
         "rxjs": "^7.2.0"
@@ -2788,6 +2789,7 @@
       "version": "0.0.33",
       "resolved": "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz",
       "integrity": "sha512-HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ==",
+      "dev": true,
       "dependencies": {
         "@types/node": "*"
       }
@@ -11448,7 +11450,7 @@
       "version": "5.3.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz",
       "integrity": "sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==",
-      "devOptional": true,
+      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
diff --git a/src/main.ts b/src/main.ts
index fd68d11..6f1188c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -77,7 +77,7 @@ async function bootstrap() {
   }
 
   // Example: process.env.CORS_VALID_ORIGINS=localhost,ngrok-free => parse to [ /localhost/, /ngrok-free/ ]
-  const origins = process.env.CORS_VALID_ORIGINS.split(',').map((origin) => new RegExp(origin)) || [
+  const origins = process.env.CORS_VALID_ORIGINS?.split(',').map((origin) => new RegExp(origin)) || [
     /localhost/,
     /ngrok-free/
   ]
diff --git a/src/payment/controllers/payment.controller.ts b/src/payment/controllers/payment.controller.ts
index 7275f51..2923ad0 100644
--- a/src/payment/controllers/payment.controller.ts
+++ b/src/payment/controllers/payment.controller.ts
@@ -42,7 +42,7 @@ export class PaymentController {
     //1. Validate signature with other data
     const result = this.paymentService.verifyPaymentWebhookData(momoPaymentResponseDto)
     if (!result) return false
-    
+
     //2. Process webhook
     return this.paymentService.processWebhook(PaymentMethod.MOMO, momoPaymentResponseDto)
   }
@@ -55,13 +55,13 @@ export class PaymentController {
     console.log('Handling PAYOS webhook', JSON.stringify(webhookData))
     this.paymentService.setStrategy(PaymentMethod.PAY_OS)
 
+    // just skip for confirmWebhook
+    if (webhookData.data.orderCode == 123) return true
+
     //1. Validate signature with other data
     const result = this.paymentService.verifyPaymentWebhookData(webhookData)
     if (!result) return false
 
-    // // just skip for confirmWebhook
-    // if (webhookData.data.orderCode == 123) return true
-
     //2. Process webhook
     return this.paymentService.processWebhook(PaymentMethod.PAY_OS, webhookData)
   }
@@ -72,7 +72,7 @@ export class PaymentController {
   // @Post('webhook/payos-confirm')
   // async verifyWebhook() {
   //   console.log('Handling Confirm  Webhook URL for PAYOS')
-    
+
   //   await this.paymentService.payOSPaymentStrategy.verifyWebhookUrl()
   // }
 }