Merge remote-tracking branch 'origin/main' into iframe-redirections

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [0.84.6](https://github.com/juspay/hyperswitch-web/compare/v0.84.5...v0.84.6) (2024-08-30)
+
+
+### Bug Fixes
+
+* added support for customPodUri instead of switchToCustomPod ([#591](https://github.com/juspay/hyperswitch-web/issues/591)) ([f9fed51](https://github.com/juspay/hyperswitch-web/commit/f9fed5117e74c63f813117d5eceafc4a000e17dc))
+
 ## [0.84.5](https://github.com/juspay/hyperswitch-web/compare/v0.84.4...v0.84.5) (2024-08-26)
 
 ## [0.84.4](https://github.com/juspay/hyperswitch-web/compare/v0.84.3...v0.84.4) (2024-08-23)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "orca-payment-page",
-  "version": "0.84.5",
+  "version": "0.84.6",
   "main": "index.js",
   "private": true,
   "dependencies": {

src/App.res

@@ -45,6 +45,7 @@ let make = () => {
             "hyperComponentName",
           )->Types.getHyperComponentNameFromStr
         let merchantHostname = CardUtils.getQueryParamsDictforKey(url.search, "merchantHostname")
+        let customPodUri = CardUtils.getQueryParamsDictforKey(url.search, "customPodUri")
 
         <PreMountLoader
           publishableKey
@@ -54,6 +55,7 @@ let make = () => {
           ephemeralKey
           hyperComponentName
           merchantHostname
+          customPodUri
         />
       }
     | "achBankTransfer"

src/Components/SavedPaymentManagement.res

@@ -5,7 +5,7 @@ let make = (~savedMethods: array<PaymentType.customerMethods>, ~setSavedMethods)
 
   let {iframeId} = Recoil.useRecoilValueFromAtom(RecoilAtoms.keys)
   let {config} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
-  let switchToCustomPod = Recoil.useRecoilValueFromAtom(RecoilAtoms.switchToCustomPod)
+  let customPodUri = Recoil.useRecoilValueFromAtom(RecoilAtoms.customPodUri)
   let logger = Recoil.useRecoilValueFromAtom(RecoilAtoms.loggerAtom)
 
   let removeSavedMethod = (
@@ -28,7 +28,7 @@ let make = (~savedMethods: array<PaymentType.customerMethods>, ~setSavedMethods)
       ~ephemeralKey=config.ephemeralKey,
       ~paymentMethodId=paymentItem.paymentMethodId,
       ~logger,
-      ~switchToCustomPod,
+      ~customPodUri,
     )
     ->then(res => {
       let dict = res->getDictFromJson

src/LoaderController.res

@@ -11,7 +11,7 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
   let (optionsPayment, setOptionsPayment) = Recoil.useRecoilState(optionAtom)
   let setSessionId = Recoil.useSetRecoilState(sessionId)
   let setBlockConfirm = Recoil.useSetRecoilState(isConfirmBlocked)
-  let setSwitchToCustomPod = Recoil.useSetRecoilState(switchToCustomPod)
+  let setCustomPodUri = Recoil.useSetRecoilState(customPodUri)
   let setIsGooglePayReady = Recoil.useSetRecoilState(isGooglePayReady)
   let setIsApplePayReady = Recoil.useSetRecoilState(isApplePayReady)
   let (divH, setDivH) = React.useState(_ => 0.0)
@@ -231,8 +231,8 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
               logger.setSessionId(sdkSessionId)
               if Window.isInteg {
                 setBlockConfirm(_ => dict->getBool("blockConfirm", false))
-                setSwitchToCustomPod(_ => dict->getBool("switchToCustomPod", false))
               }
+              setCustomPodUri(_ => dict->getString("customPodUri", ""))
               updateOptions(dict)
               setSessionId(_ => {
                 sdkSessionId

src/PaymentMethodCollectElement.res

@@ -100,7 +100,7 @@ let make = (~integrateError, ~logger) => {
           ~clientSecret=keys.clientSecret->Option.getOr(""),
           ~publishableKey=keys.publishableKey,
           ~logger,
-          ~switchToCustomPod=false,
+          ~customPodUri="",
           ~uri,
           ~body=pmdBody,
         )
@@ -171,7 +171,7 @@ let make = (~integrateError, ~logger) => {
         ~clientSecret=keys.clientSecret->Option.getOr(""),
         ~publishableKey=keys.publishableKey,
         ~logger,
-        ~switchToCustomPod=false,
+        ~customPodUri="",
         ~endpoint=ApiEndpoint.getApiEndPoint(),
         ~body=pmdBody,
       )
@@ -296,8 +296,13 @@ let make = (~integrateError, ~logger) => {
                       className="font-bold text-5xl mt-5 lg:mt-0 lg:text-3xl flex justify-center items-center">
                       <p> {React.string(`${options.currency} ${options.amount}`)} </p>
                     </div>
-                    <div className="flex items-center justify-center h-12 w-auto bg-white rounded-sm">
-                      <img className="max-h-12 w-auto max-w-21 h-auto w-auto" src={merchantLogo} alt="O" />
+                    <div
+                      className="flex items-center justify-center h-12 w-auto bg-white rounded-sm">
+                      <img
+                        className="max-h-12 w-auto max-w-21 h-auto w-auto"
+                        src={merchantLogo}
+                        alt="O"
+                      />
                     </div>
                   </div>
                   <div className="lg:mx-5">

src/Payments/PlaidSDKIframe.res

@@ -57,7 +57,7 @@ let make = () => {
       clientSecret,
       headers,
       ~optLogger=Some(logger),
-      ~switchToCustomPod=false,
+      ~customPodUri="",
       ~isForceSync=true,
     )
     ->then(json => {

src/Payments/PreMountLoader.res

@@ -7,6 +7,7 @@ let make = (
   ~ephemeralKey,
   ~hyperComponentName: Types.hyperComponentName,
   ~merchantHostname,
+  ~customPodUri,
 ) => {
   open Utils
   let (paymentMethodsResponseSent, setPaymentMethodsResponseSent) = React.useState(_ => false)
@@ -37,7 +38,7 @@ let make = (
         ~clientSecret,
         ~publishableKey,
         ~logger,
-        ~switchToCustomPod=false,
+        ~customPodUri,
         ~endpoint,
       )
     | _ => JSON.Encode.null->Promise.resolve
@@ -49,7 +50,7 @@ let make = (
         ~clientSecret,
         ~publishableKey,
         ~optLogger=Some(logger),
-        ~switchToCustomPod=false,
+        ~customPodUri,
         ~endpoint,
       )
     | _ => JSON.Encode.null->Promise.resolve
@@ -61,7 +62,7 @@ let make = (
         ~clientSecret,
         ~publishableKey,
         ~optLogger=Some(logger),
-        ~switchToCustomPod=false,
+        ~customPodUri,
         ~endpoint,
         ~merchantHostname,
       )
@@ -73,7 +74,7 @@ let make = (
       PaymentHelpers.fetchSavedPaymentMethodList(
         ~ephemeralKey,
         ~optLogger=Some(logger),
-        ~switchToCustomPod=false,
+        ~customPodUri,
         ~endpoint,
       )
     | _ => JSON.Encode.null->Promise.resolve

src/Payments/QRCodeDisplay.res

@@ -16,7 +16,7 @@ let make = () => {
   let (clientSecret, setClientSecret) = React.useState(_ => "")
   let (headers, setHeaders) = React.useState(_ => [])
   let logger = Recoil.useRecoilValueFromAtom(RecoilAtoms.loggerAtom)
-  let switchToCustomPod = Recoil.useRecoilValueFromAtom(RecoilAtoms.switchToCustomPod)
+  let customPodUri = Recoil.useRecoilValueFromAtom(RecoilAtoms.customPodUri)
 
   React.useEffect0(() => {
     messageParentWindow([("iframeMountedCallback", true->JSON.Encode.bool)])
@@ -55,7 +55,7 @@ let make = () => {
           paymentIntentId,
           headers->Dict.toArray,
           ~optLogger=Some(logger),
-          ~switchToCustomPod,
+          ~customPodUri,
         )
         ->then(res => {
           Modal.close(setOpenModal)
@@ -88,7 +88,7 @@ let make = () => {
       clientSecret,
       headers,
       ~optLogger=Some(logger),
-      ~switchToCustomPod,
+      ~customPodUri,
     )
     ->then(json => {
       let dict = json->getDictFromJson

src/Utilities/ApiEndpoint.res

@@ -18,14 +18,11 @@ let getApiEndPoint = (~publishableKey="", ~isConfirmCall=false) => {
   }
 }
 
-let addCustomPodHeader = (arr: array<(string, string)>, ~switchToCustomPod=?) => {
-  let customPod = switch switchToCustomPod {
-  | Some(val) => val
-  | None => false
-  }
-  if customPod {
-    arr->Array.concat([("x-feature", "router-custom-dbd")])->Dict.fromArray
-  } else {
-    arr->Dict.fromArray
+let addCustomPodHeader = (arr: array<(string, string)>, ~customPodUri=?) => {
+  switch customPodUri {
+  | Some("")
+  | None => ()
+  | Some(customPodVal) => arr->Array.push(("x-feature", customPodVal))
   }
+  arr->Dict.fromArray
 }