fix: added a callback in the usePaymentIntent

juspay · May 29, 2024 · 0c76d24 · 0c76d24
1 parent 944ece0
commit 0c76d24
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 34 deletions.
diff --git a/src/Components/SavedMethods.res b/src/Components/SavedMethods.res
@@ -146,7 +146,7 @@ let make = (
           ~confirmParam=confirm.confirmParams,
           ~handleUserError=false,
           (),
-        )->ignore
+        )
       } else {
         if isUnknownPaymentMethod || confirm.confirmTimestamp < confirm.readyTimestamp {
           setUserError(localeString.selectPaymentMethodText)

diff --git a/src/Payment.res b/src/Payment.res
@@ -246,7 +246,7 @@ let make = (~paymentMode, ~integrateError, ~logger) => {
   }
 
   let submitAPICall = (body, confirmParam) => {
-    intent(~bodyArr=body, ~confirmParam, ~handleUserError=false, ())->ignore
+    intent(~bodyArr=body, ~confirmParam, ~handleUserError=false, ())
   }
   React.useEffect(() => {
     setCvcNumber(_ => "")

diff --git a/src/Payments/ACHBankDebit.res b/src/Payments/ACHBankDebit.res
@@ -76,7 +76,7 @@ let make = (~paymentType: CardThemeType.mode) => {
             ~state=state.value,
             ~paymentType=paymentMethodListValue.payment_type,
           )
-          intent(~bodyArr=body, ~confirmParam=confirm.confirmParams, ~handleUserError=false, ())->ignore
+          intent(~bodyArr=body, ~confirmParam=confirm.confirmParams, ~handleUserError=false, ())
         | None => ()
         }
         ()

diff --git a/src/Payments/ACHBankTransfer.res b/src/Payments/ACHBankTransfer.res
@@ -33,7 +33,7 @@ let make = (~paymentType: CardThemeType.mode) => {
           ~handleUserError=false,
           ~iframeId,
           (),
-        )->ignore
+        )
       } else {
         postFailedSubmitResponse(~errortype="validation_error", ~message="Please enter all fields")
       }

diff --git a/src/Payments/ApplePay.res b/src/Payments/ApplePay.res
@@ -67,7 +67,7 @@ let make = (~sessionObj: option<JSON.t>) => {
       ~handleUserError=true,
       ~isThirdPartyFlow,
       (),
-    )->ignore
+    )
   }
 
   let syncPayment = () => {

diff --git a/src/Payments/BacsBankDebit.res b/src/Payments/BacsBankDebit.res
@@ -89,7 +89,7 @@ let make = (~paymentType: CardThemeType.mode) => {
           ~country=getCountryCode(country.value).isoAlpha2,
           ~bankAccountHolderName=fullName.value,
         )
-        intent(~bodyArr=body, ~confirmParam=confirm.confirmParams, ~handleUserError=false, ())->ignore
+        intent(~bodyArr=body, ~confirmParam=confirm.confirmParams, ~handleUserError=false, ())
         ()
       } else {
         postFailedSubmitResponse(~errortype="validation_error", ~message="Please enter all fields")

diff --git a/src/Payments/BacsBankTransfer.res b/src/Payments/BacsBankTransfer.res
@@ -37,7 +37,7 @@ let default = (paymentType: CardThemeType.mode) => {
           ~handleUserError=false,
           ~iframeId,
           (),
-        )->ignore
+        )
       } else {
         postFailedSubmitResponse(~errortype="validation_error", ~message="Please enter all fields")
       }

diff --git a/src/Payments/BecsBankDebit.res b/src/Payments/BecsBankDebit.res
@@ -68,7 +68,7 @@ let make = (~paymentType: CardThemeType.mode) => {
               ~postalCode=postalCode.value,
               ~state=state.value,
             )
-            intent(~bodyArr=body, ~confirmParam=confirm.confirmParams, ~handleUserError=false, ())->ignore
+            intent(~bodyArr=body, ~confirmParam=confirm.confirmParams, ~handleUserError=false, ())
           }
         | None => ()
         }

diff --git a/src/Payments/Boleto.res b/src/Payments/Boleto.res
@@ -65,7 +65,7 @@ let make = (~paymentType: CardThemeType.mode) => {
           ~handleUserError=false,
           ~iframeId,
           (),
-        )->ignore
+        )
       } else {
         postFailedSubmitResponse(~errortype="validation_error", ~message="Please enter all fields")
       }

diff --git a/src/Payments/CardPayment.res b/src/Payments/CardPayment.res
@@ -178,7 +178,7 @@ let make = (
           ~confirmParam=confirm.confirmParams,
           ~handleUserError=false,
           (),
-        )->ignore
+        )
       } else {
         if cardNumber === "" {
           setCardError(_ => localeString.cardNumberEmptyText)

diff --git a/src/Payments/GPay.res b/src/Payments/GPay.res
@@ -69,7 +69,7 @@ let make = (~sessionObj: option<SessionsType.token>, ~thirdPartySessionObj: opti
       ~handleUserError=true,
       ~isThirdPartyFlow,
       (),
-    )->ignore
+    )
   }
 
   let paymentMethodTypes = DynamicFieldsUtils.usePaymentMethodTypeFromList(

diff --git a/src/Payments/KlarnaPayment.res b/src/Payments/KlarnaPayment.res
@@ -53,7 +53,7 @@ let make = (~paymentType) => {
     )
     if confirm.doSubmit {
       if complete {
-        intent(~bodyArr=body, ~confirmParam=confirm.confirmParams, ~handleUserError=false, ())->ignore
+        intent(~bodyArr=body, ~confirmParam=confirm.confirmParams, ~handleUserError=false, ())
       } else {
         postFailedSubmitResponse(~errortype="validation_error", ~message="Please enter all fields")
       }

diff --git a/src/Payments/KlarnaSDK.res b/src/Payments/KlarnaSDK.res
@@ -60,7 +60,7 @@ let make = (~sessionObj: SessionsType.token) => {
             paymentMethodListValue->PaymentUtils.getConnectors(PayLater(Klarna(SDK)))
           let body = PaymentBody.klarnaSDKbody(~token=res.authorization_token, ~connectors)
           res.approved
-            ? intent(~bodyArr=body, ~confirmParam=confirm.confirmParams, ~handleUserError=false, ())->ignore
+            ? intent(~bodyArr=body, ~confirmParam=confirm.confirmParams, ~handleUserError=false, ())
             : handleCloseLoader()
         },
       )

diff --git a/src/Payments/PayPal.res b/src/Payments/PayPal.res
@@ -65,7 +65,7 @@ let make = () => {
           },
           ~handleUserError=true,
           (),
-        )->ignore
+        )
       } else {
         setPaypalClicked(_ => false)
       }

diff --git a/src/Payments/PaymentMethodsWrapper.res b/src/Payments/PaymentMethodsWrapper.res
@@ -94,7 +94,7 @@ let make = (~paymentType: CardThemeType.mode, ~paymentMethodName: string) => {
           ~handleUserError=false,
           ~iframeId,
           (),
-        )->ignore
+        )
       } else {
         postFailedSubmitResponse(~errortype="validation_error", ~message="Please enter all fields")
       }

diff --git a/src/Payments/PaypalSDKHelpers.res b/src/Payments/PaypalSDKHelpers.res
@@ -48,15 +48,19 @@ let loadPaypalSDK = (
             ~paymentType=paymentMethodListValue.payment_type,
             ~body,
           )
-          intent(
-            ~bodyArr=modifiedPaymentBody,
-            ~confirmParam={
-              return_url: options.wallets.walletReturnUrl,
-              publishableKey,
-            },
-            ~handleUserError=true,
-            (),
-          )->then(val => val->Utils.getDictFromJson->Utils.getString("orderId", "")->resolve)
+          Promise.make((resolve, _) => {
+            intent(
+              ~bodyArr=modifiedPaymentBody,
+              ~confirmParam={
+                return_url: options.wallets.walletReturnUrl,
+                publishableKey,
+              },
+              ~handleUserError=true,
+              ~intentCallback=val =>
+                val->Utils.getDictFromJson->Utils.getString("orderId", "")->resolve,
+              (),
+            )
+          })
         },
         onApprove: (_data, actions) => {
           if !options.readOnly {
@@ -210,7 +214,7 @@ let loadBraintreePaypalSdk = (
                               },
                               ~handleUserError=true,
                               (),
-                            )->ignore
+                            )
                           },
                         )
                   },

diff --git a/src/Payments/SepaBankDebit.res b/src/Payments/SepaBankDebit.res
@@ -64,7 +64,7 @@ let make = (~paymentType: CardThemeType.mode) => {
               ~postalCode=postalCode.value,
               ~state=state.value,
             )
-            intent(~bodyArr=body, ~confirmParam=confirm.confirmParams, ~handleUserError=false, ())->ignore
+            intent(~bodyArr=body, ~confirmParam=confirm.confirmParams, ~handleUserError=false, ())
           }
         | None => ()
         }

diff --git a/src/Payments/SepaBankTransfer.res b/src/Payments/SepaBankTransfer.res
@@ -49,7 +49,7 @@ let make = (~paymentType) => {
           ~handleUserError=false,
           ~iframeId,
           (),
-        )->ignore
+        )
       } else {
         postFailedSubmitResponse(~errortype="validation_error", ~message="Please enter all fields")
       }

diff --git a/src/Utilities/PaymentHelpers.res b/src/Utilities/PaymentHelpers.res
@@ -14,16 +14,17 @@ let closePaymentLoaderIfAny = () => handlePostMessage([("fullscreen", false->JSO
 
 type paymentIntent = (
   ~handleUserError: bool=?,
-  ~bodyArr: array<(string, RescriptCore.JSON.t)>,
+  ~bodyArr: array<(string, JSON.t)>,
   ~confirmParam: ConfirmType.confirmParams,
   ~iframeId: string=?,
   ~isThirdPartyFlow: bool=?,
+  ~intentCallback: Core__JSON.t => unit=?,
   unit,
-) => RescriptCore.Promise.t<Core__JSON.t>
+) => unit
 
 type completeAuthorize = (
   ~handleUserError: bool=?,
-  ~bodyArr: array<(string, RescriptCore.JSON.t)>,
+  ~bodyArr: array<(string, JSON.t)>,
   ~confirmParam: ConfirmType.confirmParams,
   ~iframeId: string=?,
   unit,
@@ -997,6 +998,7 @@ let usePaymentIntent = (optLogger, paymentType) => {
     ~confirmParam: ConfirmType.confirmParams,
     ~iframeId=keys.iframeId,
     ~isThirdPartyFlow=false,
+    ~intentCallback=_ => (),
     (),
   ) => {
     switch keys.clientSecret {
@@ -1069,7 +1071,6 @@ let usePaymentIntent = (optLogger, paymentType) => {
         }
         if blockConfirm && Window.isInteg {
           Console.log3("CONFIRM IS BLOCKED", body->JSON.parseExn, headers)
-          JSON.Encode.null->resolve
         } else {
           intentCall(
             ~fetchApi,
@@ -1089,6 +1090,11 @@ let usePaymentIntent = (optLogger, paymentType) => {
             ~counter=0,
             (),
           )
+          ->then(val => {
+            intentCallback(val)
+            resolve()
+          })
+          ->ignore
         }
       }
 
@@ -1143,22 +1149,19 @@ let usePaymentIntent = (optLogger, paymentType) => {
             ~message="Payment Failed. Try again!",
           )
           Console.warn("Please enable atleast one Payment method.")
-          JSON.Encode.null->resolve
         }
       | SemiLoaded => intentWithoutMandate("")
       | _ =>
         postFailedSubmitResponse(
           ~errortype="payment_methods_loading",
           ~message="Please wait. Try again!",
         )
-        JSON.Encode.null->resolve
       }
     | None =>
       postFailedSubmitResponse(
         ~errortype="confirm_payment_failed",
         ~message="Payment failed. Try again!",
       )
-      JSON.Encode.null->resolve
     }
   }
 }