fix: preserve camelCase keys and numeric values in merchant session validation

src/Types/ApplePayTypes.res

@@ -163,7 +163,7 @@ let getPaymentRequestFromSession = (~sessionObj, ~componentName) => {
     ->Option.getOr(Dict.make())
     ->Dict.get("payment_request_data")
     ->Option.getOr(Dict.make()->JSON.Encode.object)
-    ->transformKeys(CamelCase)
+    ->transformKeysWithoutModifyingValue(CamelCase)
 
   let requiredShippingContactFields =
     paymentRequest

src/Types/GooglePayType.res

@@ -130,15 +130,15 @@ let jsonToPaymentRequestDataType: (paymentDataRequest, Dict.t<JSON.t>) => paymen
   paymentRequest.allowedPaymentMethods =
     jsonDict
     ->getArray("allowed_payment_methods")
-    ->Array.map(json => transformKeys(json, CamelCase))
+    ->Array.map(json => transformKeysWithoutModifyingValue(json, CamelCase))
   paymentRequest.transactionInfo =
     jsonDict
     ->getJsonFromDict("transaction_info", JSON.Encode.null)
-    ->transformKeys(CamelCase)
+    ->transformKeysWithoutModifyingValue(CamelCase)
   paymentRequest.merchantInfo =
     jsonDict
     ->getJsonFromDict("merchant_info", JSON.Encode.null)
-    ->transformKeys(CamelCase)
+    ->transformKeysWithoutModifyingValue(CamelCase)
 
   paymentRequest
 }
@@ -173,14 +173,16 @@ let getPaymentDataFromSession = (~sessionObj, ~componentName) => {
     baseRequest->Identity.anyTypeToJson,
   )
   paymentDataRequest.allowedPaymentMethods = gpayobj.allowed_payment_methods->arrayJsonToCamelCase
-  paymentDataRequest.transactionInfo = gpayobj.transaction_info->transformKeys(CamelCase)
-  paymentDataRequest.merchantInfo = gpayobj.merchant_info->transformKeys(CamelCase)
+  paymentDataRequest.transactionInfo =
+    gpayobj.transaction_info->transformKeysWithoutModifyingValue(CamelCase)
+  paymentDataRequest.merchantInfo =
+    gpayobj.merchant_info->transformKeysWithoutModifyingValue(CamelCase)
   paymentDataRequest.emailRequired = gpayobj.emailRequired
 
   if componentName->getIsExpressCheckoutComponent {
     paymentDataRequest.shippingAddressRequired = gpayobj.shippingAddressRequired
     paymentDataRequest.shippingAddressParameters =
-      gpayobj.shippingAddressParameters->transformKeys(CamelCase)
+      gpayobj.shippingAddressParameters->transformKeysWithoutModifyingValue(CamelCase)
     paymentDataRequest.callbackIntents = ["SHIPPING_ADDRESS"->JSON.Encode.string]
   }
 

src/Utilities/ApplePayHelpers.res

@@ -89,7 +89,7 @@ let startApplePaySession = (
       ->Option.getOr(Dict.make())
       ->Dict.get("session_token_data")
       ->Option.getOr(Dict.make()->JSON.Encode.object)
-      ->transformKeys(CamelCase)
+      ->transformKeysWithoutModifyingValue(CamelCase)
     ssn.completeMerchantValidation(merchantSession)
   }
 

src/Utilities/Utils.res

@@ -403,13 +403,15 @@ let toCamelCase = str => {
 let toCamelCaseWithNumberSupport = str => {
   if str->String.includes(":") {
     str
-  } else {
+  } else if str->String.includes("_") {
     str
     ->String.toLowerCase
     ->Js.String2.unsafeReplaceBy0(%re(`/([-_][a-z])/g`), (letter, _, _) => {
       letter->String.toUpperCase
     })
     ->String.replaceRegExp(%re(`/[^a-zA-Z0-9]/g`), "")
+  } else {
+    str->String.replaceRegExp(%re(`/[^a-zA-Z0-9]/g`), "")
   }
 }
 
@@ -474,14 +476,14 @@ let rec transformKeysWithoutModifyingValue = (json: JSON.t, to: case) => {
   ->Dict.toArray
   ->Array.map(((key, value)) => {
     let x = switch JSON.Classify.classify(value) {
-    | Object(obj) => (key->toCase, obj->JSON.Encode.object->transformKeys(to))
+    | Object(obj) => (key->toCase, obj->JSON.Encode.object->transformKeysWithoutModifyingValue(to))
     | Array(arr) => (
         key->toCase,
         {
           arr
           ->Array.map(item =>
             if item->JSON.Decode.object->Option.isSome {
-              item->transformKeys(to)
+              item->transformKeysWithoutModifyingValue(to)
             } else {
               item
             }
@@ -1171,7 +1173,7 @@ let fetchApiWithLogging = async (
 
 let arrayJsonToCamelCase = arr => {
   arr->Array.map(item => {
-    item->transformKeys(CamelCase)
+    item->transformKeysWithoutModifyingValue(CamelCase)
   })
 }