Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 0 additions & 4 deletions src/App.res
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,7 @@ let make = () => {
let clientSecret = getQueryParamsDictforKey(url.search, "clientSecret")
let sessionId = getQueryParamsDictforKey(url.search, "sessionId")
let publishableKey = getQueryParamsDictforKey(url.search, "publishableKey")
let profileId = getQueryParamsDictforKey(url.search, "profileId")
let endpoint = getQueryParamsDictforKey(url.search, "endpoint")
let pmClientSecret = getQueryParamsDictforKey(url.search, "pmClientSecret")
let pmSessionId = getQueryParamsDictforKey(url.search, "pmSessionId")
let hyperComponentName =
getQueryParamsDictforKey(
Expand All @@ -110,13 +108,11 @@ let make = () => {

<PreMountLoader
publishableKey
profileId
sessionId
sdkAuthorization
clientSecret
endpoint
pmSessionId
pmClientSecret
hyperComponentName
merchantHostname
customPodUri
Expand Down
13 changes: 1 addition & 12 deletions src/CardTheme.res
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ let defaultConfig = {
locale: "auto",
fonts: [],
clientSecret: "",
pmClientSecret: "",
pmSessionId: "",
loader: Auto,
sdkAuthorization: "",
Expand Down Expand Up @@ -399,16 +398,7 @@ let itemToObjMapper = (
logger,
) => {
unknownKeysWarning(
[
"appearance",
"fonts",
"locale",
"clientSecret",
"loader",
"pmClientSecret",
"pmSessionId",
"sdkAuthorization",
],
["appearance", "fonts", "locale", "clientSecret", "loader", "pmSessionId", "sdkAuthorization"],
dict,
"elements",
)
Expand All @@ -418,7 +408,6 @@ let itemToObjMapper = (
fonts: getFonts("fonts", dict, logger),
clientSecret: getWarningString(dict, "clientSecret", "", ~logger),
pmSessionId: getWarningString(dict, "pmSessionId", "", ~logger),
pmClientSecret: getWarningString(dict, "pmClientSecret", "", ~logger),
loader: getWarningString(dict, "loader", "auto", ~logger)->getShowLoader,
sdkAuthorization: getString(dict, "sdkAuthorization", ""),
}
Expand Down
10 changes: 3 additions & 7 deletions src/Components/SavedMethodsV2.res
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ let make = (~cvcProps: CardUtils.cvcProps) => {
let (_, setManagePaymentMethod) = Recoil.useRecoilState(RecoilAtomsV2.managePaymentMethod)
let loggerState = Recoil.useRecoilValueFromAtom(RecoilAtoms.loggerAtom)
let updateCard = PaymentHelpersV2.useUpdateCard(Some(loggerState), Card)
let {iframeId, publishableKey, profileId} = keys
let {iframeId, sdkAuthorization} = keys
let {isCVCValid, cvcNumber, setCvcError} = cvcProps
let complete = isCVCValid->Option.getOr(false) && paymentTokenAtom.paymentToken !== ""
let isEmpty = cvcNumber == ""
Expand Down Expand Up @@ -57,12 +57,10 @@ let make = (~cvcProps: CardUtils.cvcProps) => {
try {
let res = await PaymentHelpersV2.updatePaymentMethod(
~bodyArr,
~pmClientSecret=keys.pmClientSecret->Option.getOr(""),
~publishableKey,
~profileId,
~pmSessionId=keys.pmSessionId->Option.getOr(""),
~logger,
~customPodUri,
~sdkAuthorization=sdkAuthorization->Option.getOr(""),
)

let dict = res->getDictFromJson
Expand Down Expand Up @@ -98,13 +96,11 @@ let make = (~cvcProps: CardUtils.cvcProps) => {

try {
let res = await PaymentHelpersV2.deletePaymentMethodV2(
~publishableKey,
~profileId,
~pmClientSecret=keys.pmClientSecret->Option.getOr(""),
~paymentMethodToken=paymentItem.paymentToken,
~pmSessionId=keys.pmSessionId->Option.getOr(""),
~logger,
~customPodUri,
~sdkAuthorization=sdkAuthorization->Option.getOr(""),
)

let dict = res->getDictFromJson
Expand Down
8 changes: 0 additions & 8 deletions src/Hooks/CommonHooks.res
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ type keys = {
sdkAuthorization: option<string>,
paymentId: string,
pmSessionId?: string,
pmClientSecret?: string,
publishableKey: string,
profileId: string,
iframeId: string,
parentURL: string,
sdkHandleOneClickConfirmPayment: bool,
Expand Down Expand Up @@ -117,11 +115,6 @@ let updateKeys = (dict, keyPair, setKeys) => {
...prev,
publishableKey: dict->Utils.getString(key, valueStr),
})
| "profileId" =>
setKeys(prev => {
...prev,
profileId: dict->Utils.getString(key, valueStr),
})
| "paymentId" =>
setKeys(prev => {
...prev,
Expand All @@ -145,7 +138,6 @@ let defaultkeys = {
clientSecret: None,
sdkAuthorization: None,
publishableKey: "",
profileId: "",
paymentId: "",
iframeId: "",
parentURL: "*",
Expand Down
6 changes: 0 additions & 6 deletions src/LoaderController.res
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
locale: config.locale === "auto" ? Window.Navigator.language : config.locale,
fonts: config.fonts,
clientSecret: config.clientSecret,
pmClientSecret: config.pmClientSecret,
pmSessionId: config.pmSessionId,
loader: config.loader,
sdkAuthorization: config.sdkAuthorization,
Expand Down Expand Up @@ -277,14 +276,12 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
let paymentOptions = dict->getDictFromObj("paymentOptions")

let clientSecret = getWarningString(paymentOptions, "clientSecret", "", ~logger)
let pmClientSecret = getWarningString(paymentOptions, "pmClientSecret", "", ~logger)
let pmSessionId = getWarningString(paymentOptions, "pmSessionId", "", ~logger)
let sdkAuthorization = getString(paymentOptions, "sdkAuthorization", "")
setKeys(prev => {
...prev,
clientSecret: Some(clientSecret),
sdkAuthorization: Some(sdkAuthorization),
pmClientSecret,
pmSessionId,
})
logger.setClientSecret(clientSecret)
Expand Down Expand Up @@ -322,7 +319,6 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
[
("iframeId", "no-element"->JSON.Encode.string),
("publishableKey", ""->JSON.Encode.string),
("profileId", ""->JSON.Encode.string),
("paymentId", ""->JSON.Encode.string),
("parentURL", "*"->JSON.Encode.string),
("sdkHandleOneClickConfirmPayment", true->JSON.Encode.bool),
Expand All @@ -341,14 +337,12 @@ let make = (~children, ~paymentMode, ~setIntegrateErrorError, ~logger, ~initTime
let paymentOptions = dict->getDictFromObj("paymentOptions")

let clientSecret = getWarningString(paymentOptions, "clientSecret", "", ~logger)
let pmClientSecret = getWarningString(paymentOptions, "pmClientSecret", "", ~logger)
let pmSessionId = getWarningString(paymentOptions, "pmSessionId", "", ~logger)
let sdkAuthorization = getString(paymentOptions, "sdkAuthorization", "")
setKeys(prev => {
...prev,
clientSecret: Some(clientSecret),
sdkAuthorization: Some(sdkAuthorization),
pmClientSecret,
pmSessionId,
})
logger.setClientSecret(clientSecret)
Expand Down
34 changes: 5 additions & 29 deletions src/Payments/PreMountLoader.res
Original file line number Diff line number Diff line change
Expand Up @@ -125,21 +125,17 @@ let getMessageHandlerV1Elements = (

let getMessageHandlerV2PMM = (
~pmSessionId,
~pmClientSecret,
~publishableKey,
~profileId,
~logger,
~customPodUri,
~endpoint,
~sdkAuthorization,
) => {
let listPromise = PaymentHelpersV2.fetchPaymentManagementList(
~pmSessionId,
~pmClientSecret,
~publishableKey,
~profileId,
~optLogger=Some(logger),
~customPodUri,
~endpoint,
~sdkAuthorization,
)

ev => {
Expand Down Expand Up @@ -184,25 +180,9 @@ module PreMountLoaderForElements = {

module PreMountLoaderForPMMElements = {
@react.component
let make = (
~logger,
~endpoint,
~customPodUri,
~pmSessionId,
~pmClientSecret,
~publishableKey,
~profileId,
) => {
let make = (~logger, ~endpoint, ~customPodUri, ~pmSessionId, ~sdkAuthorization) => {
useMessageHandler(() =>
getMessageHandlerV2PMM(
~pmSessionId,
~pmClientSecret,
~publishableKey,
~profileId,
~logger,
~customPodUri,
~endpoint,
)
getMessageHandlerV2PMM(~pmSessionId, ~sdkAuthorization, ~logger, ~customPodUri, ~endpoint)
)

React.null
Expand All @@ -213,12 +193,10 @@ module PreMountLoaderForPMMElements = {
let make = (
~sessionId,
~publishableKey,
~profileId,
~sdkAuthorization,
~clientSecret,
~endpoint,
~pmSessionId,
~pmClientSecret,
~hyperComponentName: Types.hyperComponentName,
~merchantHostname,
~customPodUri,
Expand Down Expand Up @@ -246,8 +224,6 @@ let make = (
isSdkParamsEnabled
/>
| PaymentMethodsManagementElements =>
<PreMountLoaderForPMMElements
logger endpoint customPodUri pmSessionId pmClientSecret publishableKey profileId
/>
<PreMountLoaderForPMMElements logger endpoint customPodUri pmSessionId sdkAuthorization />
}
}
1 change: 0 additions & 1 deletion src/Types/CardThemeType.res
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ type fonts = {
type configClass = {
appearance: appearance,
locale: string,
pmClientSecret: string,
pmSessionId: string,
clientSecret: string,
fonts: array<fonts>,
Expand Down
24 changes: 0 additions & 24 deletions src/Utilities/HyperVaultHelpers.res

This file was deleted.

Loading
Loading