Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: api-endpoint-url fix for custom backend url #357

Merged
merged 10 commits into from
May 10, 2024
Merged

fix: api-endpoint-url fix for custom backend url #357

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
025d296
fix: apiendpointurl fix for custom backend url
May 8, 2024
6eac436
fix: log remvoed
May 8, 2024
e899c78
Merge branch 'main' into apiendpoint-url-fix
May 8, 2024
593ccb8
fix: comments addressed & refactor
May 8, 2024
a8485bf
Merge branch 'apiendpoint-url-fix' of github.com:juspay/hyperswitch-w…
May 8, 2024
87983aa
fix: comments addressed
May 8, 2024
c762d06
Merge branch 'main' into apiendpoint-url-fix
May 8, 2024
381615e
refactor: src/orca-loader/Elements.res
vsrivatsa-edinburgh May 9, 2024
86c098f
refactor: src/orca-loader/Elements.res
vsrivatsa-edinburgh May 9, 2024
7f06b28
refactor: src/orca-loader/Elements.res
vsrivatsa-edinburgh May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/App.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ let make = () => {
let clientSecret = CardUtils.getQueryParamsDictforKey(url.search, "clientSecret")
let sessionId = CardUtils.getQueryParamsDictforKey(url.search, "sessionId")
let publishableKey = CardUtils.getQueryParamsDictforKey(url.search, "publishableKey")
<PreMountLoader publishableKey sessionId clientSecret />
let endpoint = CardUtils.getQueryParamsDictforKey(url.search, "endpoint")
<PreMountLoader publishableKey sessionId clientSecret endpoint />
}
| "achBankTransfer"
| "bacsBankTransfer"
Expand Down
6 changes: 6 additions & 0 deletions src/LoaderController.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,12 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
dict->getJsonObjectFromDict("isReadyToPay")->JSON.Decode.bool->Option.getOr(false)
)
}
if dict->getDictIsSome("endpoint") {
switch dict->getString("endpoint", "") {
| "" => ()
| endpoint => ApiEndpoint.setApiEndPoint(endpoint)
}
}
if dict->getDictIsSome("paymentMethodList") {
let paymentMethodList = dict->getJsonObjectFromDict("paymentMethodList")
let listDict = paymentMethodList->getDictFromJson
Expand Down
4 changes: 1 addition & 3 deletions src/Payments/PreMountLoader.res
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@react.component
let make = (~sessionId, ~publishableKey, ~clientSecret) => {
let make = (~sessionId, ~publishableKey, ~clientSecret, ~endpoint) => {
open Utils
let (paymentMethodsResponseSent, setPaymentMethodsResponseSent) = React.useState(_ => false)
let (
Expand All @@ -15,8 +15,6 @@ let make = (~sessionId, ~publishableKey, ~clientSecret) => {
(),
)

let endpoint = ApiEndpoint.getApiEndPoint(~publishableKey, ())

let paymentMethodsResponse = React.useMemo0(() =>
PaymentHelpers.fetchPaymentMethodList(
~clientSecret,
Expand Down
26 changes: 13 additions & 13 deletions src/orca-loader/Elements.res
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 appearance =
localOptions->Dict.get("appearance")->Option.getOr(Dict.make()->JSON.Encode.object)
let launchTime = localOptions->getFloat("launchTime", 0.0)
Expand Down Expand Up @@ -67,7 +68,7 @@ let make = (
<iframe
id ="orca-payment-element-iframeRef-${localSelectorString}"
name="orca-payment-element-iframeRef-${localSelectorString}"
src="${ApiEndpoint.sdkDomainUrl}/index.html?fullscreenType=${componentType}&publishableKey=${publishableKey}&clientSecret=${clientSecret}&sessionId=${sdkSessionId}"
src="${ApiEndpoint.sdkDomainUrl}/index.html?fullscreenType=${componentType}&publishableKey=${publishableKey}&clientSecret=${clientSecret}&sessionId=${sdkSessionId}&endpoint=${endpoint}"
prafulkoppalkar marked this conversation as resolved.
Show resolved Hide resolved
allow="*"
name="orca-payment"
></iframe>
Expand Down Expand Up @@ -99,9 +100,9 @@ let make = (
let preMountLoaderIframeCallback = (ev: Types.event) => {
let json = ev.data->Identity.anyTypeToJson
let dict = json->Utils.getDictFromJson
if dict->Dict.get("preMountLoaderIframeMountedCallback")->Belt.Option.isSome {
if dict->Dict.get("preMountLoaderIframeMountedCallback")->Option.isSome {
resolve(true->JSON.Encode.bool)
} else if dict->Dict.get("preMountLoaderIframeUnMount")->Belt.Option.isSome {
} else if dict->Dict.get("preMountLoaderIframeUnMount")->Option.isSome {
unMountPreMountLoaderIframe()
}
}
Expand All @@ -125,16 +126,15 @@ let make = (
->PaymentMethodsRecord.itemToObjMapper,
~paymentMethod="wallet",
~paymentMethodType="apple_pay",
)->Belt.Option.isSome

let isGooglePayPresent =
PaymentMethodsRecord.getPaymentMethodTypeFromList(
~paymentMethodListValue=json
->Utils.getDictFromJson
->PaymentMethodsRecord.itemToObjMapper,
~paymentMethod="wallet",
~paymentMethodType="google_pay",
)->Belt.Option.isSome
)->Option.isSome

let isGooglePayPresent = PaymentMethodsRecord.getPaymentMethodTypeFromList(
~paymentMethodListValue=json
->Utils.getDictFromJson
->PaymentMethodsRecord.itemToObjMapper,
~paymentMethod="wallet",
~paymentMethodType="google_pay",
)->Option.isSome

if isApplePayPresent || isGooglePayPresent {
if (
Expand Down
Loading