fix: openurl_if_required enhancement

src/Types/ConfirmType.res

@@ -1,6 +1,7 @@
 type confirmParams = {
   return_url: string,
   publishableKey: string,
+  redirect?: string,
 }
 
 type confirm = {
@@ -14,6 +15,7 @@ open Utils
 let defaultConfirm = {
   return_url: "",
   publishableKey: "",
+  redirect: "if_required",
 }
 let getConfirmParams = (dict, str) => {
   dict
@@ -23,6 +25,7 @@ let getConfirmParams = (dict, str) => {
     {
       return_url: getString(json, "return_url", ""),
       publishableKey: getString(json, "publishableKey", ""),
+      redirect: getString(json, "redirect", "if_required"),
     }
   })
   ->Option.getOr(defaultConfirm)

src/Types/PaymentType.res

@@ -908,6 +908,7 @@ let getConfirmParams = dict => {
   {
     return_url: dict->getString("return_url", ""),
     publishableKey: dict->getString("publishableKey", ""),
+    redirect: dict->getString("redirect", "if_required"),
   }
 }
 

src/Utilities/PaymentHelpers.res

@@ -320,7 +320,6 @@ let rec intentCall = (
   ~sdkHandleOneClickConfirmPayment,
   ~counter,
   ~isPaymentSession=false,
-  ~paymentSessionRedirect="if_redirect",
   (),
 ) => {
   open Promise
@@ -357,6 +356,7 @@ let rec intentCall = (
     let url = urlSearch(confirmParam.return_url)
     url.searchParams.set("payment_intent_client_secret", clientSecret)
     url.searchParams.set("status", "failed")
+    handlePostMessage([("confirmParamsPostMessage", confirmParam->Identity.anyTypeToJson)])
 
     if statusCode->String.charAt(0) !== "2" {
       res
@@ -516,7 +516,7 @@ let rec intentCall = (
               | (Paypal, false) =>
                 if !isPaymentSession {
                   postSubmitResponse(~jsonData=data, ~url=url.href)
-                } else if paymentSessionRedirect === "always" {
+                } else if confirmParam.redirect === Some("always") {
                   handleOpenUrl(url.href)
                 } else {
                   resolve(data)

src/orca-loader/Elements.res

@@ -28,6 +28,7 @@ let make = (
     let savedPaymentElement = Dict.make()
     let localOptions = options->JSON.Decode.object->Option.getOr(Dict.make())
     let endpoint = ApiEndpoint.getApiEndPoint(~publishableKey, ())
+    let redirect = ref("if_required")
 
     let appearance =
       localOptions->Dict.get("appearance")->Option.getOr(Dict.make()->JSON.Encode.object)
@@ -592,6 +593,10 @@ let make = (
         let handlePollStatusMessage = (ev: Types.event) => {
           let eventDataObject = ev.data->anyTypeToJson
           let headers = [("Content-Type", "application/json"), ("api-key", publishableKey)]
+          switch eventDataObject->getOptionalJsonFromJson("confirmParamsPostMessage") {
+          | Some(obj) => redirect := obj->getDictFromJson->getString("redirect", "if_required")
+          | None => ()
+          }
           switch eventDataObject->getOptionalJsonFromJson("poll_status") {
           | Some(val) => {
               handlePostMessage([
@@ -623,17 +628,21 @@ let make = (
                   ~isForceSync=true,
                 )
                 ->then(json => {
-                  let dict = json->JSON.Decode.object->Option.getOr(Dict.make())
-                  let status = dict->getString("status", "")
-                  let returnUrl = dict->getString("return_url", "")
-                  Window.Location.replace(
-                    `${returnUrl}?payment_intent_client_secret=${clientSecret}&status=${status}`,
-                  )
-                  resolve()
+                  if redirect.contents === "always" {
+                    let dict = json->JSON.Decode.object->Option.getOr(Dict.make())
+                    let status = dict->getString("status", "")
+                    let returnUrl = dict->getString("return_url", "")
+                    Window.Location.replace(
+                      `${returnUrl}?payment_intent_client_secret=${clientSecret}&status=${status}`,
+                    )
+                    resolve(JSON.Encode.null)
+                  } else {
+                    resolve(json)
+                  }
                 })
-                ->catch(_ => {
+                ->catch(err => {
                   Window.Location.replace(url)
-                  resolve()
+                  resolve(err->Identity.anyTypeToJson)
                 })
                 ->ignore
                 ->resolve
@@ -643,6 +652,31 @@ let make = (
             }
           | None => ()
           }
+
+          switch eventDataObject->getOptionalJsonFromJson("openurl_if_required") {
+          | Some(val) =>
+            if redirect.contents === "always" {
+              Window.Location.replace(val->JSON.Decode.string->Option.getOr(""))
+              resolve(JSON.Encode.null)
+            } else {
+              PaymentHelpers.retrievePaymentIntent(
+                clientSecret,
+                headers,
+                ~optLogger=Some(logger),
+                ~switchToCustomPod,
+                ~isForceSync=true,
+              )
+              ->then(json => {
+                resolve(json)
+              })
+              ->catch(err => {
+                resolve(err->Identity.anyTypeToJson)
+              })
+              ->finally(_ => handlePostMessage([("fullscreen", false->JSON.Encode.bool)]))
+            }->ignore
+
+          | None => ()
+          }
         }
 
         addSmartEventListener("message", handleApplePayMounted, "onApplePayMount")

src/orca-loader/Hyper.res

@@ -279,10 +279,9 @@ let make = (publishableKey, options: option<JSON.t>, analyticsInfo: option<JSON.
 
         let redirect =
           payload
-          ->JSON.Decode.object
-          ->Option.flatMap(x => x->Dict.get("redirect"))
-          ->Option.flatMap(JSON.Decode.string)
-          ->Option.getOr("if_required")
+          ->getDictFromJson
+          ->getDictfromDict("confirmParams")
+          ->getString("redirect", "if_required")
 
         let url =
           confirmParams
@@ -351,6 +350,7 @@ let make = (publishableKey, options: option<JSON.t>, analyticsInfo: option<JSON.
                     [
                       ("return_url", url->JSON.Encode.string),
                       ("publishableKey", publishableKey->JSON.Encode.string),
+                      ("redirect", redirect->JSON.Encode.string),
                     ]
                     ->Dict.fromArray
                     ->JSON.Encode.object,

src/orca-loader/PaymentSessionMethods.res

@@ -70,6 +70,7 @@ let getCustomerSavedPaymentMethods = (
         let confirmParam: ConfirmType.confirmParams = {
           return_url: returnUrl,
           publishableKey,
+          redirect,
         }
 
         let paymentIntentID = String.split(clientSecret, "_secret_")[0]->Option.getOr("")
@@ -125,7 +126,6 @@ let getCustomerSavedPaymentMethods = (
           ~sdkHandleOneClickConfirmPayment=false,
           ~counter=0,
           ~isPaymentSession=true,
-          ~paymentSessionRedirect=redirect,
           (),
         )
       }