{React.string("000123456789")}
-
@@ -112,7 +113,7 @@ let make = (~setModalData) => {
let (sortCode, setSortCode) = React.useState(_ => "")
let (isRoutingValid, setIsRoutingValid) = React.useState(_ => None)
let (routingError, setRoutingError) = React.useState(_ => "")
- let {themeObj, config} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
+ let {themeObj, config, localeString} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
let (accountType, setAccountType) = React.useState(() => "Savings")
let (openModal, setOpenModal) = React.useState(_ => false)
@@ -188,7 +189,7 @@ let make = (~setModalData) => {
{React.string("1234")}
+ {React.string("1234")}
- {React.string("Billing Details")}
+ {React.string(localeString.billingDetailsText)}
{React.string(
diff --git a/src/Types/PaymentConfirmTypes.res b/src/Types/PaymentConfirmTypes.res
index ffc56e75e..8be8a2015 100644
--- a/src/Types/PaymentConfirmTypes.res
+++ b/src/Types/PaymentConfirmTypes.res
@@ -34,6 +34,7 @@ type nextAction = {
bank_transfer_steps_and_charges_details: option,
session_token: option,
image_data_url: option,
+ display_to_timestamp: option,
}
type intent = {
nextAction: nextAction,
@@ -56,6 +57,7 @@ let defaultNextAction = {
bank_transfer_steps_and_charges_details: None,
session_token: None,
image_data_url: None,
+ display_to_timestamp: None,
}
let defaultIntent = {
nextAction: defaultNextAction,
@@ -123,6 +125,12 @@ let getNextAction = (dict, str) => {
getJsonObjFromDict(json, "session_token", Js.Dict.empty())->Js.Json.object_,
),
image_data_url: Some(json->getString("image_data_url", "")),
+ display_to_timestamp: Some(
+ json
+ ->Js.Dict.get("display_to_timestamp")
+ ->Belt.Option.flatMap(Js.Json.decodeNumber)
+ ->Belt.Option.getWithDefault(0.0),
+ ),
}
})
->Belt.Option.getWithDefault(defaultNextAction)
diff --git a/src/Types/PaymentType.res b/src/Types/PaymentType.res
index a1fbe2f87..bbbd5bbe9 100644
--- a/src/Types/PaymentType.res
+++ b/src/Types/PaymentType.res
@@ -298,7 +298,7 @@ let getAddress = (dict, str, logger) => {
line2: getWarningString(json, "line2", "", ~logger),
city: getWarningString(json, "city", "", ~logger),
state: getWarningString(json, "state", "", ~logger),
- country: country,
+ country,
postal_code: getWarningString(json, "postal_code", "", ~logger),
}
})
@@ -866,6 +866,8 @@ let itemToObjMapper = (dict, logger) => {
"wallets",
"showCardFormByDefault",
"disableSaveCards",
+ "sdkHandleOneClickConfirmPayment",
+ "showCardFormByDefault",
],
dict,
"options",
@@ -893,7 +895,7 @@ let itemToObjMapper = (dict, logger) => {
}
}
-type loadType = Loading | Loaded(Js.Json.t) | SemiLoaded | LoadError(Js.Json.t)
+type loadType = Loading | Loaded(Js.Json.t) | SemiLoaded | LoadError
let getIsAllStoredCardsHaveName = (savedCards: array) => {
savedCards
diff --git a/src/Utilities/DynamicFieldsUtils.res b/src/Utilities/DynamicFieldsUtils.res
index be003fbcd..c21995fbf 100644
--- a/src/Utilities/DynamicFieldsUtils.res
+++ b/src/Utilities/DynamicFieldsUtils.res
@@ -15,6 +15,7 @@ let getName = (item: PaymentMethodsRecord.required_fields, field: RecoilAtomType
let countryNames = Utils.getCountryNames(Country.country)
let billingAddressFields: array = [
+ BillingName,
AddressLine1,
AddressLine2,
AddressCity,
@@ -25,6 +26,7 @@ let billingAddressFields: array = [
let isBillingAddressFieldType = (fieldType: PaymentMethodsRecord.paymentMethodsFields) => {
switch fieldType {
+ | BillingName
| AddressLine1
| AddressLine2
| AddressCity
@@ -49,9 +51,8 @@ let getBillingAddressPathFromFieldType = (fieldType: PaymentMethodsRecord.paymen
let removeBillingDetailsIfUseBillingAddress = (
requiredFields: Js.Array2.t,
+ billingAddress: PaymentType.billingAddress,
) => {
- let {billingAddress} = Recoil.useRecoilValueFromAtom(RecoilAtoms.optionAtom)
-
if billingAddress.isUseBillingAddress {
requiredFields->Js.Array2.filter(requiredField => {
!(requiredField.field_type->isBillingAddressFieldType)
@@ -61,9 +62,10 @@ let removeBillingDetailsIfUseBillingAddress = (
}
}
-let addBillingAddressIfUseBillingAddress = fieldsArr => {
- let {billingAddress} = Recoil.useRecoilValueFromAtom(RecoilAtoms.optionAtom)
-
+let addBillingAddressIfUseBillingAddress = (
+ fieldsArr,
+ billingAddress: PaymentType.billingAddress,
+) => {
if billingAddress.isUseBillingAddress {
fieldsArr->Js.Array2.concat(billingAddressFields)
} else {
@@ -119,8 +121,9 @@ let useRequiredFieldsEmptyAndValid = (
let currency = Recoil.useRecoilValueFromAtom(RecoilAtoms.userCurrency)
let setAreRequiredFieldsValid = Recoil.useSetRecoilState(RecoilAtoms.areRequiredFieldsValid)
let setAreRequiredFieldsEmpty = Recoil.useSetRecoilState(RecoilAtoms.areRequiredFieldsEmpty)
+ let {billingAddress} = Recoil.useRecoilValueFromAtom(RecoilAtoms.optionAtom)
- let fieldsArrWithBillingAddress = fieldsArr->addBillingAddressIfUseBillingAddress
+ let fieldsArrWithBillingAddress = fieldsArr->addBillingAddressIfUseBillingAddress(billingAddress)
React.useEffect7(() => {
let areRequiredFieldsValid = fieldsArr->Js.Array2.reduce((acc, paymentMethodFields) => {
@@ -132,7 +135,7 @@ let useRequiredFieldsEmptyAndValid = (
| AddressCountry(countryArr) => country !== "" || countryArr->Belt.Array.length === 0
| BillingName => checkIfNameIsValid(requiredFields, paymentMethodFields, billingName)
| AddressLine1 => line1.value !== ""
- | AddressLine2 => line2.value !== ""
+ | AddressLine2 => billingAddress.isUseBillingAddress ? true : line2.value !== ""
| Bank => selectedBank !== "" || bankNames->Belt.Array.length === 0
| PhoneNumber => phone.value !== ""
| StateAndCity => state.value !== "" && city.value !== ""
@@ -169,7 +172,7 @@ let useRequiredFieldsEmptyAndValid = (
| AddressCountry(countryArr) => country === "" && countryArr->Belt.Array.length > 0
| BillingName => billingName.value === ""
| AddressLine1 => line1.value === ""
- | AddressLine2 => line2.value === ""
+ | AddressLine2 => billingAddress.isUseBillingAddress ? false : line2.value === ""
| Bank => selectedBank === "" && bankNames->Belt.Array.length > 0
| StateAndCity => city.value === "" || state.value === ""
| CountryAndPincode(countryArr) =>
@@ -272,7 +275,7 @@ let useSetInitialRequiredFields = (
logger,
)
- React.useEffect0(() => {
+ React.useEffect1(() => {
let getNameValue = (item: PaymentMethodsRecord.required_fields) => {
requiredFields
->Js.Array2.filter(requiredFields => requiredFields.field_type === item.field_type)
@@ -379,7 +382,7 @@ let useSetInitialRequiredFields = (
}
})
None
- })
+ }, [requiredFields])
}
let useRequiredFieldsBody = (
@@ -428,6 +431,7 @@ let useRequiredFieldsBody = (
->Belt.Option.getWithDefault(Country.defaultTimeZone)
countryCode.isoAlpha2
}
+ | BillingName => billingName.value
| CardNumber => cardNumber->CardUtils.clearSpaces
| CardExpiryMonth =>
let (month, _) = CardUtils.getExpiryDates(cardExpiry)
@@ -443,7 +447,6 @@ let useRequiredFieldsBody = (
| CardExpiryMonthAndYear
| CardExpiryAndCvc
| FullName
- | BillingName
| None => ""
}
}
@@ -452,8 +455,20 @@ let useRequiredFieldsBody = (
if billingAddress.isUseBillingAddress {
billingAddressFields->Js.Array2.reduce((acc, item) => {
let value = item->getFieldValueFromFieldType
- let path = item->getBillingAddressPathFromFieldType
- acc->Js.Dict.set(path, value->Js.Json.string)
+ if item === BillingName {
+ let arr = value->Js.String2.split(" ")
+ acc->Js.Dict.set(
+ "billing.address.first_name",
+ arr->Belt.Array.get(0)->Belt.Option.getWithDefault("")->Js.Json.string,
+ )
+ acc->Js.Dict.set(
+ "billing.address.last_name",
+ arr->Belt.Array.get(1)->Belt.Option.getWithDefault("")->Js.Json.string,
+ )
+ } else {
+ let path = item->getBillingAddressPathFromFieldType
+ acc->Js.Dict.set(path, value->Js.Json.string)
+ }
acc
}, requiredFieldsBody)
} else {
@@ -513,6 +528,7 @@ let useRequiredFieldsBody = (
let isFieldTypeToRenderOutsideBilling = (fieldType: PaymentMethodsRecord.paymentMethodsFields) => {
switch fieldType {
+ | FullName
| CardNumber
| CardExpiryMonth
| CardExpiryYear
@@ -559,10 +575,10 @@ let combineCountryAndPostal = arr => {
acc->Js.Array2.concat(
switch item {
| AddressCountry(val) => val
- | _ => [""]
+ | _ => []
},
)
- }, [""])
+ }, [])
if hasCountryAndPostal {
arr->Js.Array2.push(CountryAndPincode(options))->ignore
@@ -614,13 +630,70 @@ let combineCardExpiryAndCvc = arr => {
}
}
-let updateDynamicFields = (arr: Js.Array2.t, ()) => {
+let updateDynamicFields = (
+ arr: Js.Array2.t,
+ billingAddress,
+ (),
+) => {
arr
->Utils.removeDuplicate
->Js.Array2.filter(item => item !== None)
- ->addBillingAddressIfUseBillingAddress
+ ->addBillingAddressIfUseBillingAddress(billingAddress)
->combineStateAndCity
->combineCountryAndPostal
->combineCardExpiryMonthAndYear
->combineCardExpiryAndCvc
}
+
+let useSubmitCallback = () => {
+ let logger = Recoil.useRecoilValueFromAtom(RecoilAtoms.loggerAtom)
+ let (line1, setLine1) = Recoil.useLoggedRecoilState(RecoilAtoms.userAddressline1, "line1", logger)
+ let (line2, setLine2) = Recoil.useLoggedRecoilState(RecoilAtoms.userAddressline2, "line2", logger)
+ let (state, setState) = Recoil.useLoggedRecoilState(RecoilAtoms.userAddressState, "state", logger)
+ let (postalCode, setPostalCode) = Recoil.useLoggedRecoilState(
+ RecoilAtoms.userAddressPincode,
+ "postal_code",
+ logger,
+ )
+ let (city, setCity) = Recoil.useLoggedRecoilState(RecoilAtoms.userAddressCity, "city", logger)
+ let {billingAddress} = Recoil.useRecoilValueFromAtom(RecoilAtoms.optionAtom)
+
+ let {localeString} = Recoil.useRecoilValueFromAtom(RecoilAtoms.configAtom)
+
+ React.useCallback5((ev: Window.event) => {
+ let json = ev.data->Js.Json.parseExn
+ let confirm = json->Utils.getDictFromJson->ConfirmType.itemToObjMapper
+ if confirm.doSubmit {
+ if line1.value == "" {
+ setLine1(.prev => {
+ ...prev,
+ errorString: localeString.line1EmptyText,
+ })
+ }
+ if line2.value == "" {
+ setLine2(.prev => {
+ ...prev,
+ errorString: billingAddress.isUseBillingAddress ? "" : localeString.line2EmptyText,
+ })
+ }
+ if state.value == "" {
+ setState(.prev => {
+ ...prev,
+ errorString: localeString.stateEmptyText,
+ })
+ }
+ if postalCode.value == "" {
+ setPostalCode(.prev => {
+ ...prev,
+ errorString: localeString.postalCodeEmptyText,
+ })
+ }
+ if city.value == "" {
+ setCity(.prev => {
+ ...prev,
+ errorString: localeString.cityEmptyText,
+ })
+ }
+ }
+ }, (line1, line2, state, city, postalCode))
+}
diff --git a/src/Utilities/PaymentBody.res b/src/Utilities/PaymentBody.res
index 69e60785d..1c2cca1ff 100644
--- a/src/Utilities/PaymentBody.res
+++ b/src/Utilities/PaymentBody.res
@@ -1450,6 +1450,24 @@ let openBankingUKBody = () => {
]
}
+let pixTransferBody = () => {
+ [
+ ("payment_method", "bank_transfer"->Js.Json.string),
+ ("payment_method_type", "pix"->Js.Json.string),
+ (
+ "payment_method_data",
+ [
+ (
+ "bank_transfer",
+ [("pix", Js.Dict.empty()->Js.Json.object_)]->Js.Dict.fromArray->Js.Json.object_,
+ ),
+ ]
+ ->Js.Dict.fromArray
+ ->Js.Json.object_,
+ ),
+ ]
+}
+
let getPaymentBody = (
~paymentMethod,
~fullName,
@@ -1513,6 +1531,7 @@ let getPaymentBody = (
| "card_redirect" => cardRedirectBody()
| "open_banking_uk" => openBankingUKBody()
| "evoucher" => rewardBody(~paymentMethodType=paymentMethod)
+ | "pix_transfer" => pixTransferBody()
| _ => []
}
}
diff --git a/src/Utilities/PaymentHelpers.res b/src/Utilities/PaymentHelpers.res
index 04b7fb3e9..df0989b87 100644
--- a/src/Utilities/PaymentHelpers.res
+++ b/src/Utilities/PaymentHelpers.res
@@ -253,17 +253,20 @@ let intentCall = (
])
} else if intent.nextAction.type_ === "qr_code_information" {
let qrData = intent.nextAction.image_data_url->Belt.Option.getWithDefault("")
+ let expiryTime = intent.nextAction.display_to_timestamp->Belt.Option.getWithDefault(0.0)
let headerObj = Js.Dict.empty()
- headers->Js.Array2.forEach(entries => {
- let (x, val) = entries
- Js.Dict.set(headerObj, x, val->Js.Json.string)
- })
+ headers->Js.Array2.forEach(
+ entries => {
+ let (x, val) = entries
+ Js.Dict.set(headerObj, x, val->Js.Json.string)
+ },
+ )
let metaData =
[
("qrData", qrData->Js.Json.string),
("paymentIntentId", clientSecret->Js.Json.string),
("headers", headerObj->Js.Json.object_),
- ("expiryTime", Js.Json.null),
+ ("expiryTime", expiryTime->Belt.Float.toString->Js.Json.string),
("url", url.href->Js.Json.string),
]->Js.Dict.fromArray
handleLogging(
@@ -333,7 +336,11 @@ let intentCall = (
handlePostMessage(message)
} else {
switch paymentType {
- | Card => postSubmitResponse(~jsonData=data, ~url=url.href)
+ | Card
+ | Gpay
+ | Applepay
+ | Paypal =>
+ postSubmitResponse(~jsonData=data, ~url=url.href)
| _ => openUrl(url.href)
}
}
@@ -356,10 +363,14 @@ let intentCall = (
)
}
if intent.status === "failed" {
- setIsManualRetryEnabled(._ => intent.manualRetryAllowed)
+ setIsManualRetryEnabled(. _ => intent.manualRetryAllowed)
}
switch paymentType {
- | Card => postSubmitResponse(~jsonData=data, ~url=url.href)
+ | Card
+ | Gpay
+ | Applepay
+ | Paypal =>
+ postSubmitResponse(~jsonData=data, ~url=url.href)
| _ => openUrl(url.href)
}
} else {
@@ -433,11 +444,11 @@ let usePaymentSync = (optLogger: option, paymentType: pay
| Loaded(_) => paymentSync()
| SemiLoaded
| Loading
- | LoadError(_) => ()
+ | LoadError => ()
}
| None =>
postFailedSubmitResponse(
- ~errortype="SYNC_PAYMENT_FAILED",
+ ~errortype="sync_payment_failed",
~message="Sync Payment Failed. Try Again!",
)
}
@@ -450,7 +461,15 @@ let rec maskPayload = payloadDict => {
keys
->Js.Array2.map(key => {
let value = payloadDict->Js.Dict.get(key)->Belt.Option.getWithDefault(Js.Json.null)
- if value->Js.Json.decodeObject->Belt.Option.isSome {
+ if value->Js.Json.decodeArray->Belt.Option.isSome {
+ let arr = value->Js.Json.decodeArray->Belt.Option.getWithDefault([])
+ arr->Js.Array2.forEachi((element, index) => {
+ maskedPayload->Js.Dict.set(
+ key ++ "[" ++ index->Belt.Int.toString ++ "]",
+ element->Utils.getDictFromJson->maskPayload->Js.Json.string,
+ )
+ })
+ } else if value->Js.Json.decodeObject->Belt.Option.isSome {
let valueDict = value->Utils.getDictFromJson
maskedPayload->Js.Dict.set(key, valueDict->maskPayload->Js.Json.string)
} else {
@@ -503,9 +522,31 @@ let usePaymentIntent = (optLogger: option, paymentType: p
)
let uri = `${endpoint}/payments/${paymentIntentID}/confirm`
let fetchMethod = Fetch.Post
- let loggerPayload = body->Js.Dict.fromArray->maskPayload
let callIntent = body => {
+ let maskedPayload =
+ body
+ ->OrcaUtils.safeParseOpt
+ ->Belt.Option.getWithDefault(Js.Json.null)
+ ->Utils.getDictFromJson
+ ->maskPayload
+ let loggerPayload =
+ [
+ ("payload", maskedPayload->Js.Json.string),
+ (
+ "headers",
+ headers
+ ->Js.Array2.map(header => {
+ let (key, value) = header
+ (key, value->Js.Json.string)
+ })
+ ->Js.Dict.fromArray
+ ->Js.Json.object_,
+ ),
+ ]
+ ->Js.Dict.fromArray
+ ->Js.Json.object_
+ ->Js.Json.stringify
switch paymentType {
| Card =>
handleLogging(
@@ -596,7 +637,7 @@ let usePaymentIntent = (optLogger: option, paymentType: p
}
| SemiLoaded => intentWithoutMandate()
| Loading
- | LoadError(_) => ()
+ | LoadError => ()
}
| None =>
postFailedSubmitResponse(
@@ -842,4 +883,4 @@ let useCustomerDetails = (
)
Js.Json.null->resolve
})
-}
\ No newline at end of file
+}
diff --git a/src/Utilities/PaymentUtils.res b/src/Utilities/PaymentUtils.res
index 456781432..f4ef8f1e1 100644
--- a/src/Utilities/PaymentUtils.res
+++ b/src/Utilities/PaymentUtils.res
@@ -230,3 +230,13 @@ let getDisplayNameAndIcon = (
| None => (defaultName, defaultIcon)
}
}
+
+let getPaymentMethodName = (~paymentMethodType, ~paymentMethodName) => {
+ if paymentMethodType == "bank_debit" {
+ paymentMethodName->Js.String2.replace("_debit", "")
+ } else if paymentMethodType == "bank_transfer" {
+ paymentMethodName->Js.String2.replace("_transfer", "")
+ } else {
+ paymentMethodName
+ }
+}
diff --git a/src/Utilities/Utils.res b/src/Utilities/Utils.res
index b43f88a23..167f2a12d 100644
--- a/src/Utilities/Utils.res
+++ b/src/Utilities/Utils.res
@@ -37,8 +37,9 @@ let handleOnClickPostMessage = (~targetOrigin="*", ev) => {
~targetOrigin,
)
}
-let handleOnConfirmPostMessage = (~targetOrigin="*", ()) => {
- handlePostMessage([("confirmTriggered", true->Js.Json.boolean)], ~targetOrigin)
+let handleOnConfirmPostMessage = (~targetOrigin="*", ~isOneClick=false, ()) => {
+ let message = isOneClick ? "oneClickConfirmTriggered" : "confirmTriggered"
+ handlePostMessage([(message, true->Js.Json.boolean)], ~targetOrigin)
}
let getOptionString = (dict, key) => {
dict->Js.Dict.get(key)->Belt.Option.flatMap(Js.Json.decodeString)
@@ -353,6 +354,17 @@ let removeDuplicate = arr => {
})
}
+let isEmailValid = email => {
+ switch email->Js.String2.match_(
+ %re(
+ "/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/"
+ ),
+ ) {
+ | Some(_match) => Some(true)
+ | None => email->Js.String2.length > 0 ? Some(false) : None
+ }
+}
+
let checkEmailValid = (
email: RecoilAtomTypes.field,
fn: (. RecoilAtomTypes.field => RecoilAtomTypes.field) => unit,
diff --git a/src/Window.res b/src/Window.res
index 805d63fba..1bf126025 100644
--- a/src/Window.res
+++ b/src/Window.res
@@ -37,6 +37,7 @@ type eventData = {
focus: bool,
blur: bool,
confirmTriggered: bool,
+ oneClickConfirmTriggered: bool,
}
type loaderEvent = {key: string, data: eventData}
@set external innerHTML: (Dom.element, string) => unit = "innerHTML"
@@ -113,7 +114,11 @@ external userAgent: string = "userAgent"
@val @scope("navigator")
external sendBeacon: (string, string) => unit = "sendBeacon"
-@val @scope(("window", "location")) external hostname: string = "hostname"
+@val @scope(("window", "location"))
+external hostname: string = "hostname"
+
+@val @scope(("window", "location"))
+external href: string = "href"
let isSandbox = hostname === "beta.hyperswitch.io"
diff --git a/src/orca-loader/Elements.res b/src/orca-loader/Elements.res
index 2be4a3774..1361a6509 100644
--- a/src/orca-loader/Elements.res
+++ b/src/orca-loader/Elements.res
@@ -145,6 +145,8 @@ let make = (
}
let msg = [("paymentMethodList", json)]->Js.Dict.fromArray
mountedIframeRef->Window.iframePostMessage(msg)
+ let maskedPayload = json->getDictFromJson->PaymentHelpers.maskPayload
+ logger.setLogInfo(~value=maskedPayload, ~eventName=PAYMENT_METHODS_RESPONSE, ())
}
}
let msg = [("sendPaymentMethodsResponse", true->Js.Json.boolean)]->Js.Dict.fromArray
@@ -241,6 +243,7 @@ let make = (
mountedIframeRef,
selectorString,
sdkHandleConfirmPayment,
+ sdkHandleOneClickConfirmPayment,
disableSaveCards,
) => {
open Promise
@@ -270,6 +273,7 @@ let make = (
("blockConfirm", blockConfirm->Js.Json.boolean),
("switchToCustomPod", switchToCustomPod->Js.Json.boolean),
("endpoint", endpoint->Js.Json.string),
+ ("sdkHandleOneClickConfirmPayment", sdkHandleOneClickConfirmPayment->Js.Json.boolean),
("parentURL", "*"->Js.Json.string),
("analyticsMetadata", analyticsMetadata),
]->Js.Dict.fromArray
diff --git a/src/orca-loader/Hyper.res b/src/orca-loader/Hyper.res
index 9a5688375..3ed07f432 100644
--- a/src/orca-loader/Hyper.res
+++ b/src/orca-loader/Hyper.res
@@ -113,12 +113,7 @@ let make = (publishableKey, options: option, analyticsInfo: option {
logger.setMerchantId(publishableKey)
logger.setSessionId(sessionID)
- logger.setLogInfo(
- ~value="orca-sdk initiated",
- ~eventName=APP_INITIATED,
- ~timestamp=sdkTimestamp,
- (),
- )
+ logger.setLogInfo(~value=Window.href, ~eventName=APP_INITIATED, ~timestamp=sdkTimestamp, ())
}
}->Sentry.sentryLogger
switch Window.getHyper->Js.Nullable.toOption {
@@ -245,7 +240,8 @@ let make = (publishableKey, options: option, analyticsInfo: optionJs.Dict.fromArray->Js.Json.object_->Promise.resolve
})
}
- let confirmPayment = payload => {
+
+ let confirmPaymentWrapper = (payload, isOneClick, result) => {
let confirmParams =
payload
->Js.Json.decodeObject
@@ -267,24 +263,6 @@ let make = (publishableKey, options: option, analyticsInfo: optionBelt.Option.getWithDefault("")
Js.Promise.make((~resolve, ~reject as _) => {
- iframeRef.contents->Js.Array2.forEach(ifR => {
- ifR->Window.iframePostMessage(
- [
- ("doSubmit", true->Js.Json.boolean),
- ("clientSecret", clientSecret.contents->Js.Json.string),
- (
- "confirmParams",
- [
- ("return_url", url->Js.Json.string),
- ("publishableKey", publishableKey->Js.Json.string),
- ]
- ->Js.Dict.fromArray
- ->Js.Json.object_,
- ),
- ]->Js.Dict.fromArray,
- )
- })
-
let handleMessage = (event: Types.event) => {
let json = event.data->eventToJson
let dict = json->getDictFromJson
@@ -308,6 +286,16 @@ let make = (publishableKey, options: option, analyticsInfo: optionJs.Dict.get("url")
->Belt.Option.flatMap(Js.Json.decodeString)
->Belt.Option.getWithDefault(url)
+
+ if isOneClick {
+ iframeRef.contents->Js.Array2.forEach(ifR => {
+ // to unset one click button loader
+ ifR->Window.iframePostMessage(
+ [("oneClickDoSubmit", false->Js.Json.boolean)]->Js.Dict.fromArray,
+ )
+ })
+ }
+
if (
val->Js.Json.decodeBoolean->Belt.Option.getWithDefault(false) &&
redirect === "always"
@@ -321,12 +309,38 @@ let make = (publishableKey, options: option, analyticsInfo: option ()
}
}
-
+ let message = isOneClick
+ ? [("oneClickDoSubmit", result->Js.Json.boolean)]->Js.Dict.fromArray
+ : [
+ ("doSubmit", true->Js.Json.boolean),
+ ("clientSecret", clientSecret.contents->Js.Json.string),
+ (
+ "confirmParams",
+ [
+ ("return_url", url->Js.Json.string),
+ ("publishableKey", publishableKey->Js.Json.string),
+ ]
+ ->Js.Dict.fromArray
+ ->Js.Json.object_,
+ ),
+ ]->Js.Dict.fromArray
addSmartEventListener("message", handleMessage, "onSubmit")
+ iframeRef.contents->Js.Array2.forEach(ifR => {
+ ifR->Window.iframePostMessage(message)
+ })
})
}
+
+ let confirmPayment = payload => {
+ confirmPaymentWrapper(payload, false, true)
+ }
+
+ let confirmOneClickPayment = (payload, result: bool) => {
+ confirmPaymentWrapper(payload, true, result)
+ }
+
let elements = elementsOptions => {
- logger.setLogInfo(~value="orca.elements called", ~eventName=ORCA_ELEMENTS_CALLED, ())
+ open Promise
let clientSecretId =
elementsOptions
->Js.Json.decodeObject
@@ -334,8 +348,15 @@ let make = (publishableKey, options: option, analyticsInfo: optionBelt.Option.flatMap(Js.Json.decodeString)
->Belt.Option.getWithDefault("")
clientSecret := clientSecretId
-
- logger.setClientSecret(clientSecretId)
+ Js.Promise.make((~resolve, ~reject as _) => {
+ logger.setClientSecret(clientSecretId)
+ resolve(. Js.Json.null)
+ })
+ ->then(_ => {
+ logger.setLogInfo(~value=Window.href, ~eventName=ORCA_ELEMENTS_CALLED, ())
+ resolve()
+ })
+ ->ignore
Elements.make(
elementsOptions,
@@ -466,7 +487,9 @@ let make = (publishableKey, options: option, analyticsInfo: optionJs.Json.object_
Window.paymentRequest(methodData, details, optionsForPaymentRequest)
}
+
let returnObject = {
+ confirmOneClickPayment,
confirmPayment,
elements,
widgets: elements,
diff --git a/src/orca-loader/LoaderPaymentElement.res b/src/orca-loader/LoaderPaymentElement.res
index ad3fd4f0e..df198ccf0 100644
--- a/src/orca-loader/LoaderPaymentElement.res
+++ b/src/orca-loader/LoaderPaymentElement.res
@@ -25,6 +25,14 @@ let make = (componentType, options, setIframeRef, iframeRef, mountPostMessage) =
->Belt.Option.flatMap(x => x->Js.Dict.get("sdkHandleConfirmPayment"))
->Belt.Option.flatMap(Js.Json.decodeBoolean)
->Belt.Option.getWithDefault(false)
+
+ let sdkHandleOneClickConfirmPayment =
+ options
+ ->Js.Json.decodeObject
+ ->Belt.Option.flatMap(x => x->Js.Dict.get("sdkHandleOneClickConfirmPayment"))
+ ->Belt.Option.flatMap(Js.Json.decodeBoolean)
+ ->Belt.Option.getWithDefault(true)
+
let disableSaveCards =
options
->Js.Json.decodeObject
@@ -65,6 +73,13 @@ let make = (componentType, options, setIframeRef, iframeRef, mountPostMessage) =
ConfirmPayment,
"onHelpConfirmPayment",
)
+ | OneClickConfirmPayment =>
+ eventHandlerFunc(
+ ev => ev.data.oneClickConfirmTriggered,
+ eventHandler,
+ OneClickConfirmPayment,
+ "onHelpOneClickConfirmPayment",
+ )
| _ => ()
}
}
@@ -292,6 +307,7 @@ let make = (componentType, options, setIframeRef, iframeRef, mountPostMessage) =
Window.querySelector(`#orca-payment-element-iframeRef-${localSelectorString}`),
localSelectorString,
sdkHandleConfirmPayment,
+ sdkHandleOneClickConfirmPayment,
disableSaveCards,
)
}
diff --git a/src/orca-loader/OrcaUtils.res b/src/orca-loader/OrcaUtils.res
index aac452edf..9e5b68880 100644
--- a/src/orca-loader/OrcaUtils.res
+++ b/src/orca-loader/OrcaUtils.res
@@ -1,5 +1,6 @@
open Utils
external toNullable: Js.Json.t => Js.Nullable.t = "%identity"
+external eventToJson: Types.eventData => Js.Json.t = "%identity"
let safeParseOpt = st => {
try {
Js.Json.parseExn(st)->Some
@@ -132,10 +133,12 @@ let rec flatten = (obj, addIndicatorForObject) => {
let flattenedSubObj = flatten(item, addIndicatorForObject)
flattenedSubObj
->Js.Dict.entries
- ->Js.Array2.forEach(subEntry => {
- let (subKey, subValue) = subEntry
- Js.Dict.set(newDict, `${key}[${index->string_of_int}].${subKey}`, subValue)
- })
+ ->Js.Array2.forEach(
+ subEntry => {
+ let (subKey, subValue) = subEntry
+ Js.Dict.set(newDict, `${key}[${index->string_of_int}].${subKey}`, subValue)
+ },
+ )
}
| _ =>
@@ -243,6 +246,7 @@ let eventHandlerFunc = (
| Ready
| Focus
| ConfirmPayment
+ | OneClickConfirmPayment
| Blur =>
switch eventHandler {
| Some(eH) => eH(Some(ev.data))
@@ -330,3 +334,27 @@ let getArrayOfTupleFromDict = dict => {
->Js.Dict.keys
->Belt.Array.map(key => (key, Js.Dict.get(dict, key)->Belt.Option.getWithDefault(Js.Json.null)))
}
+
+let makeOneClickHandlerPromise = sdkHandleOneClickConfirmPayment => {
+ open EventListenerManager
+ Js.Promise.make((~resolve, ~reject as _) => {
+ if sdkHandleOneClickConfirmPayment {
+ resolve(. Js.Json.boolean(true))
+ } else {
+ let handleMessage = (event: Types.event) => {
+ let json = event.data->eventToJson->getStringfromjson("")->safeParse
+
+ let dict = json->Utils.getDictFromJson
+ if dict->Js.Dict.get("oneClickDoSubmit")->Belt.Option.isSome {
+ resolve(.
+ dict
+ ->Js.Dict.get("oneClickDoSubmit")
+ ->Belt.Option.getWithDefault(true->Js.Json.boolean),
+ )
+ }
+ }
+ addSmartEventListener("message", handleMessage, "onOneClickHandlerPaymentConfirm")
+ Utils.handleOnConfirmPostMessage(~targetOrigin="*", ~isOneClick=true, ())
+ }
+ })
+}
diff --git a/src/orca-loader/Types.res b/src/orca-loader/Types.res
index 2fe5eea3e..a37ab20b0 100644
--- a/src/orca-loader/Types.res
+++ b/src/orca-loader/Types.res
@@ -8,6 +8,7 @@ type eventData = {
classChange: bool,
newClassType: string,
confirmTriggered: bool,
+ oneClickConfirmTriggered: bool,
}
type event = {key: string, data: eventData}
type eventParam = Event(event) | EventData(eventData) | Empty
@@ -46,6 +47,7 @@ type confirmPaymentParams = {
}
type hyperInstance = {
+ confirmOneClickPayment: (Js.Json.t, bool) => Js.Promise.t,
confirmPayment: Js.Json.t => Js.Promise.t,
elements: Js.Json.t => element,
confirmCardPayment: Js_OO.Callback.arity4<
@@ -56,6 +58,10 @@ type hyperInstance = {
paymentRequest: Js.Json.t => Js.Json.t,
}
+let oneClickConfirmPaymentFn = (_, _) => {
+ Js.Promise.resolve(Js.Dict.empty()->Js.Json.object_)
+}
+
let confirmPaymentFn = (_elements: Js.Json.t) => {
Js.Promise.resolve(Js.Dict.empty()->Js.Json.object_)
}
@@ -103,13 +109,14 @@ let create = (_componentType, _options) => {
}
let defaultElement = {
- getElement: getElement,
- update: update,
- fetchUpdates: fetchUpdates,
- create: create,
+ getElement,
+ update,
+ fetchUpdates,
+ create,
}
let defaultHyperInstance = {
+ confirmOneClickPayment: oneClickConfirmPaymentFn,
confirmPayment: confirmPaymentFn,
confirmCardPayment: confirmCardPaymentFn,
retrievePaymentIntent: retrievePaymentIntentFn,
@@ -118,7 +125,8 @@ let defaultHyperInstance = {
paymentRequest: _ev => Js.Json.null,
}
-type eventType = Escape | Change | Click | Ready | Focus | Blur | ConfirmPayment | None
+type eventType =
+ Escape | Change | Click | Ready | Focus | Blur | ConfirmPayment | OneClickConfirmPayment | None
let eventTypeMapper = event => {
switch event {
@@ -129,6 +137,7 @@ let eventTypeMapper = event => {
| "focus" => Focus
| "blur" => Blur
| "confirmTriggered" => ConfirmPayment
+ | "oneClickConfirmTriggered" => OneClickConfirmPayment
| _ => None
}
}
diff --git a/src/orca-log-catcher/ErrorBoundary.res b/src/orca-log-catcher/ErrorBoundary.res
index f8aa14567..a636fab58 100644
--- a/src/orca-log-catcher/ErrorBoundary.res
+++ b/src/orca-log-catcher/ErrorBoundary.res
@@ -98,11 +98,7 @@ module ErrorCard = {
let make = (~error: Sentry.ErrorBoundary.fallbackArg, ~level) => {
let beaconApiCall = data => {
if data->Js.Array2.length > 0 {
- let logData =
- [("data", data->Js.Array2.map(OrcaLogger.logFileToObj)->Js.Json.array)]
- ->Js.Dict.fromArray
- ->Js.Json.object_
- ->Js.Json.stringify
+ let logData = data->Js.Array2.map(OrcaLogger.logFileToObj)->Js.Json.array->Js.Json.stringify
Window.sendBeacon(GlobalVars.logEndpoint, logData)
}
}
@@ -131,7 +127,7 @@ module ErrorCard = {
platform: Window.platform,
userAgent: Window.userAgent,
appId: "",
- eventName: "SDK_CRASH",
+ eventName: SDK_CRASH,
latency: "",
paymentMethod: "",
firstEvent: false,
diff --git a/src/orca-log-catcher/OrcaLogger.res b/src/orca-log-catcher/OrcaLogger.res
index 3307ba403..a123e362c 100644
--- a/src/orca-log-catcher/OrcaLogger.res
+++ b/src/orca-log-catcher/OrcaLogger.res
@@ -27,6 +27,7 @@ type eventName =
| PAYPAL_SDK_FLOW
| APP_INITIATED
| APP_REINITIATED
+ | LOG_INITIATED
| LOADER_CALLED
| ORCA_ELEMENTS_CALLED
| PAYMENT_OPTIONS_PROVIDED
@@ -52,6 +53,7 @@ type eventName =
| REDIRECTING_USER
| DISPLAY_BANK_TRANSFER_INFO_PAGE
| DISPLAY_QR_CODE_INFO_PAGE
+ | PAYMENT_METHODS_RESPONSE
let eventNameToStrMapper = eventName => {
switch eventName {
@@ -80,6 +82,7 @@ let eventNameToStrMapper = eventName => {
| PAYPAL_SDK_FLOW => "PAYPAL_SDK_FLOW"
| APP_INITIATED => "APP_INITIATED"
| APP_REINITIATED => "APP_REINITIATED"
+ | LOG_INITIATED => "LOG_INITIATED"
| LOADER_CALLED => "LOADER_CALLED"
| ORCA_ELEMENTS_CALLED => "ORCA_ELEMENTS_CALLED"
| PAYMENT_OPTIONS_PROVIDED => "PAYMENT_OPTIONS_PROVIDED"
@@ -105,6 +108,7 @@ let eventNameToStrMapper = eventName => {
| REDIRECTING_USER => "REDIRECTING_USER"
| DISPLAY_BANK_TRANSFER_INFO_PAGE => "DISPLAY_BANK_TRANSFER_INFO_PAGE"
| DISPLAY_QR_CODE_INFO_PAGE => "DISPLAY_QR_CODE_INFO_PAGE"
+ | PAYMENT_METHODS_RESPONSE => "PAYMENT_METHODS_RESPONSE"
}
}
@@ -134,7 +138,7 @@ type logFile = {
browserName: string,
browserVersion: string,
userAgent: string,
- eventName: string,
+ eventName: eventName,
latency: string,
firstEvent: bool,
paymentMethod: string,
@@ -253,7 +257,7 @@ let logFileToObj = logFile => {
("app_id", logFile.appId->Js.Json.string),
("platform", logFile.platform->convertToScreamingSnakeCase->Js.Json.string),
("user_agent", logFile.userAgent->Js.Json.string),
- ("event_name", logFile.eventName->Js.Json.string),
+ ("event_name", logFile.eventName->eventNameToStrMapper->Js.Json.string),
("browser_name", logFile.browserName->convertToScreamingSnakeCase->Js.Json.string),
("browser_version", logFile.browserVersion->Js.Json.string),
("latency", logFile.latency->Js.Json.string),
@@ -404,6 +408,9 @@ let make = (
| None => GlobalVars.repoName
}
+ let events = ref(Js.Dict.empty())
+ let eventsCounter = ref(Js.Dict.empty())
+
let timeOut = ref(None)
let merchantId = getRefFromOption(merchantId)
@@ -417,8 +424,25 @@ let make = (
metadata := value
}
+ let calculateAndUpdateCounterHook = eventName => {
+ let updatedCounter = switch eventsCounter.contents->Js.Dict.get(eventName) {
+ | Some(num) => num + 1
+ | None => 1
+ }
+ eventsCounter.contents->Js.Dict.set(eventName, updatedCounter)
+ updatedCounter
+ }
+
let conditionalLogPush = (log: logFile) => {
- if GlobalVars.enableLogging {
+ let maxLogsPushedPerEventName = GlobalVars.maxLogsPushedPerEventName
+ let conditionalEventName = switch log.eventName {
+ | INPUT_FIELD_CHANGED => log.value // to enforce rate limiting for each input field independently
+ | _ => ""
+ }
+ let eventName = log.eventName->eventNameToStrMapper ++ conditionalEventName
+
+ let counter = eventName->calculateAndUpdateCounterHook
+ if GlobalVars.enableLogging && counter <= maxLogsPushedPerEventName {
switch loggingLevel {
| DEBUG => log->Js.Array2.push(mainLogFile, _)->ignore
| INFO =>
@@ -438,11 +462,7 @@ let make = (
let beaconApiCall = data => {
if data->Js.Array2.length > 0 {
- let logData =
- [("data", data->Js.Array2.map(logFileToObj)->Js.Json.array)]
- ->Js.Dict.fromArray
- ->Js.Json.object_
- ->Js.Json.stringify
+ let logData = data->Js.Array2.map(logFileToObj)->Js.Json.array->Js.Json.stringify
Window.sendBeacon(GlobalVars.logEndpoint, logData)
}
}
@@ -452,8 +472,6 @@ let make = (
clientSecret := value
}
- let events = ref(Js.Dict.empty())
-
let rec sendLogs = () => {
switch timeOut.contents {
| Some(val) => {
@@ -471,16 +489,16 @@ let make = (
let checkForPriorityEvents = (arrayOfLogs: array) => {
let priorityEventNames = [
- "APP_RENDERED",
- "ORCA_ELEMENTS_CALLED",
- "PAYMENT_DATA_FILLED",
- "PAYMENT_ATTEMPT",
- "CONFIRM_CALL",
- "SDK_CRASH",
- "REDIRECTING_USER",
- "DISPLAY_BANK_TRANSFER_INFO_PAGE",
- "DISPLAY_QR_CODE_INFO_PAGE",
- "SESSIONS_CALL",
+ APP_RENDERED,
+ ORCA_ELEMENTS_CALLED,
+ PAYMENT_DATA_FILLED,
+ PAYMENT_ATTEMPT,
+ CONFIRM_CALL,
+ SDK_CRASH,
+ REDIRECTING_USER,
+ DISPLAY_BANK_TRANSFER_INFO_PAGE,
+ DISPLAY_QR_CODE_INFO_PAGE,
+ SESSIONS_CALL,
]
arrayOfLogs
->Js.Array2.find(log => {
@@ -507,19 +525,20 @@ let make = (
let calculateLatencyHook = (~eventName, ~type_="", ()) => {
let currentTimestamp = Js.Date.now()
let latency = switch eventName {
- | "PAYMENT_ATTEMPT" => {
- let appRenderedTimestamp = events.contents->Js.Dict.get("APP_RENDERED")
+ | PAYMENT_ATTEMPT => {
+ let appRenderedTimestamp = events.contents->Js.Dict.get(APP_RENDERED->eventNameToStrMapper)
switch appRenderedTimestamp {
| Some(float) => currentTimestamp -. float
| _ => -1.
}
}
- | "RETRIEVE_CALL"
- | "CONFIRM_CALL"
- | "SESSIONS_CALL"
- | "PAYMENT_METHODS_CALL"
- | "CUSTOMER_PAYMENT_METHODS_CALL" => {
- let logRequestTimestamp = events.contents->Js.Dict.get(eventName ++ "_INIT")
+ | RETRIEVE_CALL
+ | CONFIRM_CALL
+ | SESSIONS_CALL
+ | PAYMENT_METHODS_CALL
+ | CUSTOMER_PAYMENT_METHODS_CALL => {
+ let logRequestTimestamp =
+ events.contents->Js.Dict.get(eventName->eventNameToStrMapper ++ "_INIT")
switch (logRequestTimestamp, type_) {
| (Some(_), "request") => 0.
| (Some(float), _) => currentTimestamp -. float
@@ -543,7 +562,7 @@ let make = (
) => {
let eventNameStr = eventName->eventNameToStrMapper
let firstEvent = events.contents->Js.Dict.get(eventNameStr)->Belt.Option.isNone
- let latency = calculateLatencyHook(~eventName=eventNameStr, ())
+ let latency = calculateLatencyHook(~eventName, ())
let localTimestamp = timestamp->Belt.Option.getWithDefault(Js.Date.now()->Belt.Float.toString)
let localTimestampFloat =
localTimestamp->Belt.Float.fromString->Belt.Option.getWithDefault(Js.Date.now())
@@ -565,7 +584,7 @@ let make = (
platform: Window.platform,
userAgent: Window.userAgent,
appId: "",
- eventName: eventNameStr,
+ eventName,
latency,
paymentMethod,
firstEvent,
@@ -596,7 +615,7 @@ let make = (
) => {
let eventNameStr = eventName->eventNameToStrMapper
let firstEvent = events.contents->Js.Dict.get(eventNameStr)->Belt.Option.isNone
- let latency = calculateLatencyHook(~eventName=eventNameStr, ~type_, ())
+ let latency = calculateLatencyHook(~eventName, ~type_, ())
let localTimestamp = timestamp->Belt.Option.getWithDefault(Js.Date.now()->Belt.Float.toString)
let localTimestampFloat =
localTimestamp->Belt.Float.fromString->Belt.Option.getWithDefault(Js.Date.now())
@@ -624,7 +643,7 @@ let make = (
platform: Window.platform,
userAgent: Window.userAgent,
appId: "",
- eventName: eventNameStr,
+ eventName,
latency,
paymentMethod,
firstEvent,
@@ -648,7 +667,7 @@ let make = (
) => {
let eventNameStr = eventName->eventNameToStrMapper
let firstEvent = events.contents->Js.Dict.get(eventNameStr)->Belt.Option.isNone
- let latency = calculateLatencyHook(~eventName=eventNameStr, ())
+ let latency = calculateLatencyHook(~eventName, ())
let localTimestamp = timestamp->Belt.Option.getWithDefault(Js.Date.now()->Belt.Float.toString)
let localTimestampFloat =
localTimestamp->Belt.Float.fromString->Belt.Option.getWithDefault(Js.Date.now())
@@ -670,7 +689,7 @@ let make = (
platform: Window.platform,
userAgent: Window.userAgent,
appId: "",
- eventName: eventNameStr,
+ eventName,
latency,
paymentMethod,
firstEvent,
@@ -683,8 +702,9 @@ let make = (
}
let setLogInitiated = () => {
- let eventName = "LOG_INITIATED"
- let firstEvent = events.contents->Js.Dict.get(eventName)->Belt.Option.isNone
+ let eventName: eventName = LOG_INITIATED
+ let eventNameStr = eventName->eventNameToStrMapper
+ let firstEvent = events.contents->Js.Dict.get(eventNameStr)->Belt.Option.isNone
let latency = calculateLatencyHook(~eventName, ())
{
logType: INFO,
@@ -713,7 +733,7 @@ let make = (
->conditionalLogPush
->ignore
checkLogSizeAndSendData()
- events.contents->Js.Dict.set(eventName, Js.Date.now())
+ events.contents->Js.Dict.set(eventNameStr, Js.Date.now())
}
let handleBeforeUnload = _event => {
diff --git a/webpack.common.js b/webpack.common.js
index d9c8df82f..17aeac1b8 100644
--- a/webpack.common.js
+++ b/webpack.common.js
@@ -65,8 +65,8 @@ if (envBackendUrl === undefined) {
let logEndpoint =
sdkEnv === "prod"
- ? "https://api.hyperswitch.io/sdk-logs"
- : "https://sandbox.juspay.io/godel/analytics";
+ ? "https://api.hyperswitch.io/logs/sdk"
+ : "https://sandbox.hyperswitch.io/logs/sdk";
// Set this to true to enable logging
let enableLogging = true;
@@ -74,6 +74,9 @@ let enableLogging = true;
// Choose from DEBUG, INFO, WARNING, ERROR, SILENT
let loggingLevel = "DEBUG";
+// Maximum logs emitted for a particular event, to rate limit logs
+let maxLogsPushedPerEventName = 100;
+
module.exports = (publicPath = "auto") => {
let entries = {
app: "./index.js",
@@ -123,6 +126,7 @@ module.exports = (publicPath = "auto") => {
sentryScriptUrl: JSON.stringify(process.env.SENTRY_SCRIPT_URL),
enableLogging: JSON.stringify(enableLogging),
loggingLevel: JSON.stringify(loggingLevel),
+ maxLogsPushedPerEventName: JSON.stringify(maxLogsPushedPerEventName),
}),
new HtmlWebpackPlugin({
inject: false,