refactor: addressed comments

Author: sakksham7

src/Utilities/APIHelpers/APIUtils.res

@@ -13,7 +13,7 @@ type apiCallV1 =
   | RetrieveStatus
   | ConfirmPayout
 
-type apiCallV2 = FetchSessionsV2
+type apiCallV2 = FetchSessionsV2 | FetchIntent
 
 type apiCall =
   | V1(apiCallV1)
@@ -26,6 +26,7 @@ type apiParams = {
   paymentMethodId: option<string>,
   forceSync: option<string>,
   pollId: option<string>,
+  paymentIdV2: option<string>,
 }
 
 let generateApiUrl = (apiCallType: apiCall, ~params: apiParams) => {
@@ -36,13 +37,15 @@ let generateApiUrl = (apiCallType: apiCall, ~params: apiParams) => {
     paymentMethodId,
     forceSync,
     pollId,
+    paymentIdV2,
   } = params
 
   let clientSecretVal = clientSecret->Option.getOr("")
   let publishableKeyVal = publishableKey->Option.getOr("")
   let paymentIntentID = Utils.getPaymentId(clientSecretVal)
   let paymentMethodIdVal = paymentMethodId->Option.getOr("")
   let pollIdVal = pollId->Option.getOr("")
+  let paymentIdVal = paymentIdV2->Option.getOr("")
 
   let baseUrl =
     customBackendBaseUrl->Option.getOr(
@@ -115,6 +118,7 @@ let generateApiUrl = (apiCallType: apiCall, ~params: apiParams) => {
   | V2(inner) =>
     switch inner {
     | FetchSessionsV2 => `v2/payments/${paymentIntentID}/create-external-sdk-tokens`
+    | FetchIntent => `v2/payments/${paymentIdVal}/get-intent`
     }
   }
 

src/Utilities/PaymentHelpers.res

@@ -36,6 +36,7 @@ let retrievePaymentIntent = async (
       paymentMethodId: None,
       forceSync: isForceSync ? Some("true") : None,
       pollId: None,
+      paymentIdV2: None,
     },
   )
 
@@ -71,6 +72,7 @@ let threeDsAuth = async (~clientSecret, ~logger, ~threeDsMethodComp, ~headers) =
       paymentMethodId: None,
       forceSync: None,
       pollId: None,
+      paymentIdV2: None,
     },
   )
   let broswerInfo = BrowserSpec.broswerInfo
@@ -172,6 +174,7 @@ let retrieveStatus = async (~publishableKey, ~customPodUri, pollID, logger) => {
       paymentMethodId: None,
       forceSync: None,
       pollId: Some(pollID),
+      paymentIdV2: None,
     },
   )
 
@@ -1368,6 +1371,7 @@ let fetchSessions = async (
       paymentMethodId: None,
       forceSync: None,
       pollId: None,
+      paymentIdV2: None,
     },
   )
 
@@ -1407,6 +1411,7 @@ let confirmPayout = async (
       paymentMethodId: None,
       forceSync: None,
       pollId: None,
+      paymentIdV2: None,
     },
   )
 
@@ -1449,6 +1454,7 @@ let createPaymentMethod = async (
       paymentMethodId: None,
       forceSync: None,
       pollId: None,
+      paymentIdV2: None,
     },
   )
 
@@ -1490,6 +1496,7 @@ let fetchPaymentMethodList = async (
       paymentMethodId: None,
       forceSync: None,
       pollId: None,
+      paymentIdV2: None,
     },
   )
 
@@ -1526,6 +1533,7 @@ let fetchCustomerPaymentMethodList = async (
       paymentMethodId: None,
       forceSync: None,
       pollId: None,
+      paymentIdV2: None,
     },
   )
 
@@ -1632,6 +1640,7 @@ let callAuthLink = async (
       paymentMethodId: None,
       forceSync: None,
       pollId: None,
+      paymentIdV2: None,
     },
   )
 
@@ -1695,6 +1704,7 @@ let callAuthExchange = async (
       paymentMethodId: None,
       forceSync: None,
       pollId: None,
+      paymentIdV2: None,
     },
   )
 
@@ -1767,6 +1777,7 @@ let fetchSavedPaymentMethodList = async (
       paymentMethodId: None,
       forceSync: None,
       pollId: None,
+      paymentIdV2: None,
     },
   )
 
@@ -1797,6 +1808,7 @@ let deletePaymentMethod = async (~ephemeralKey, ~paymentMethodId, ~logger, ~cust
       paymentMethodId: Some(paymentMethodId),
       forceSync: None,
       pollId: None,
+      paymentIdV2: None,
     },
   )
 
@@ -1834,6 +1846,7 @@ let calculateTax = async (
       paymentMethodId: None,
       forceSync: None,
       pollId: None,
+      paymentIdV2: None,
     },
   )
   let onSuccess = data => data

src/Utilities/PaymentHelpersV2.res

@@ -586,43 +586,43 @@ let fetchSessions = (
   })
 }
 
-let fetchIntent = (
+let fetchIntent = async (
   ~clientSecret,
   ~publishableKey,
   ~paymentId,
-  ~logger as _,
+  ~logger,
   ~customPodUri,
   ~endpoint,
   ~profileId,
 ) => {
-  open Promise
-  let baseHeaders = [
-    ("Content-Type", "application/json"),
-    ("x-profile-id", profileId),
-    ("Authorization", `publishable-key=${publishableKey},client-secret=${clientSecret}`),
-  ]
+  let uri = APIUtils.generateApiUrl(
+    V2(FetchIntent),
+    ~params={
+      clientSecret: Some(clientSecret),
+      customBackendBaseUrl: Some(endpoint),
+      publishableKey: Some(publishableKey),
+      paymentMethodId: None,
+      forceSync: None,
+      pollId: None,
+      paymentIdV2: Some(paymentId),
+    },
+  )
 
-  let headers = switch customPodUri {
-  | value if value != "" => [...baseHeaders, ("x-feature", value)]
-  | _ => baseHeaders
-  }
+  let onSuccess = data => data
 
-  let uri = `${endpoint}/v2/payments/${paymentId}/get-intent`
-  fetchApi(uri, ~method=#GET, ~headers=headers->ApiEndpoint.addCustomPodHeader(~customPodUri))
-  ->then(resp => {
-    if !(resp->Fetch.Response.ok) {
-      resp
-      ->Fetch.Response.json
-      ->then(_ => {
-        JSON.Encode.null->resolve
-      })
-    } else {
-      Fetch.Response.json(resp)
-    }
-  })
-  ->catch(err => {
-    let exceptionMessage = err->formatException
-    Console.error2("Error ", exceptionMessage)
-    JSON.Encode.null->resolve
-  })
+  let onFailure = _ => JSON.Encode.null
+
+  // Todo: Add logger
+  await fetchApiWithLogging(
+    uri,
+    ~eventName=CUSTOMER_PAYMENT_METHODS_CALL,
+    ~logger,
+    ~method=#GET,
+    ~customPodUri=Some(customPodUri),
+    ~publishableKey=Some(publishableKey),
+    ~clientSecret=Some(clientSecret),
+    ~profileId=Some(profileId),
+    ~onSuccess,
+    ~onFailure,
+  )
 }

src/Utilities/UnifiedHelpersV2.res

@@ -156,11 +156,7 @@ let itemToIntentObjMapper = dict => {
 }
 
 let createIntentDetails = (dict, key) => {
-  let intentDict =
-    dict
-    ->Dict.get(key)
-    ->Option.flatMap(JSON.Decode.object)
-    ->Option.getOr(Dict.make())
+  let intentDict = dict->Utils.getDictFromDict(key)
   let response = intentDict->itemToIntentObjMapper
 
   LoadedIntent(response)

src/Utilities/Utils.res

@@ -848,17 +848,30 @@ let getHeaders = (
   ~customPodUri=None,
   ~headers=Dict.make(),
   ~publishableKey=None,
+  ~clientSecret=None,
+  ~profileId=None,
 ): Fetch.Headers.t => {
+  let publishableKeyVal = publishableKey->Option.map(key => key)->Option.getOr("invalid_key")
+  let profileIdVal = profileId->Option.getOr("invalid_key")
+  let clientSecretVal = clientSecret->Option.getOr("invalid_key")
+
   let defaultHeaders = [
     ("Content-Type", "application/json"),
-    ("api-key", publishableKey->Option.map(key => key)->Option.getOr("invalid_key")),
     ("X-Client-Version", Window.version),
     ("X-Payment-Confirm-Source", "sdk"),
     ("X-Browser-Name", HyperLogger.arrayOfNameAndVersion->Array.get(0)->Option.getOr("Others")),
     ("X-Browser-Version", HyperLogger.arrayOfNameAndVersion->Array.get(1)->Option.getOr("0")),
     ("X-Client-Platform", "web"),
   ]
 
+  let authorizationHeaders = switch GlobalVars.sdkVersion {
+  | V2 => [
+      ("x-profile-id", profileIdVal),
+      ("Authorization", `publishable-key=${publishableKeyVal},client-secret=${clientSecretVal}`),
+    ]
+  | V1 => [("api-key", publishableKey->Option.map(key => key)->Option.getOr("invalid_key"))]
+  }
+
   let authHeader = switch (token, uri) {
   | (Some(tok), Some(_)) => [("Authorization", tok)]
   | _ => []
@@ -871,6 +884,7 @@ let getHeaders = (
 
   let finalHeaders = [
     ...defaultHeaders,
+    ...authorizationHeaders,
     ...authHeader,
     ...customPodHeader,
     ...Dict.toArray(headers),
@@ -949,16 +963,20 @@ let fetchApiWithLogging = async (
   ~publishableKey=None,
   ~isPaymentSession=false,
   ~onCatchCallback=None,
+  ~clientSecret=None,
+  ~profileId=None,
 ) => {
   open LoggerUtils
 
   // * Log request initiation
-  LogAPIResponse.logApiResponse(
-    ~logger,
-    ~uri,
-    ~eventName=apiEventInitMapper(eventName),
-    ~status=Request,
-  )
+  if GlobalVars.sdkVersion != V2 {
+    LogAPIResponse.logApiResponse(
+      ~logger,
+      ~uri,
+      ~eventName=apiEventInitMapper(eventName),
+      ~status=Request,
+    )
+  }
 
   try {
     let body = switch method {
@@ -976,6 +994,8 @@ let fetchApiWithLogging = async (
           ~uri,
           ~customPodUri,
           ~publishableKey,
+          ~clientSecret,
+          ~profileId,
         ),
       },
     )
@@ -984,26 +1004,30 @@ let fetchApiWithLogging = async (
 
     if resp->Fetch.Response.ok {
       let data = await Fetch.Response.json(resp)
-      LogAPIResponse.logApiResponse(
-        ~logger,
-        ~uri,
-        ~eventName=Some(eventName),
-        ~status=Success,
-        ~statusCode,
-        ~isPaymentSession,
-      )
+      if GlobalVars.sdkVersion != V2 {
+        LogAPIResponse.logApiResponse(
+          ~logger,
+          ~uri,
+          ~eventName=Some(eventName),
+          ~status=Success,
+          ~statusCode,
+          ~isPaymentSession,
+        )
+      }
       onSuccess(data)
     } else {
       let data = await resp->Fetch.Response.json
-      LogAPIResponse.logApiResponse(
-        ~logger,
-        ~uri,
-        ~eventName=Some(eventName),
-        ~status=Error,
-        ~statusCode,
-        ~data,
-        ~isPaymentSession,
-      )
+      if GlobalVars.sdkVersion != V2 {
+        LogAPIResponse.logApiResponse(
+          ~logger,
+          ~uri,
+          ~eventName=Some(eventName),
+          ~status=Error,
+          ~statusCode,
+          ~data,
+          ~isPaymentSession,
+        )
+      }
       onFailure(data)
     }
   } catch {
@@ -1017,14 +1041,16 @@ let fetchApiWithLogging = async (
           "error": exceptionMessage,
         },
       )
-      LogAPIResponse.logApiResponse(
-        ~logger,
-        ~uri,
-        ~eventName=Some(eventName),
-        ~status=Exception,
-        ~data=exceptionMessage,
-        ~isPaymentSession,
-      )
+      if GlobalVars.sdkVersion != V2 {
+        LogAPIResponse.logApiResponse(
+          ~logger,
+          ~uri,
+          ~eventName=Some(eventName),
+          ~status=Exception,
+          ~data=exceptionMessage,
+          ~isPaymentSession,
+        )
+      }
       switch onCatchCallback {
       | Some(fun) => fun(exceptionMessage)
       | None => onFailure(exceptionMessage)

src/hyper-loader/Hyper.res

@@ -340,6 +340,7 @@ let make = (keys, options: option<JSON.t>, analyticsInfo: option<JSON.t>) => {
             paymentMethodId: None,
             forceSync: None,
             pollId: None,
+            paymentIdV2: None,
           },
         )