From 31bdb2ca7c900f499dc378dc153a96a4420fec08 Mon Sep 17 00:00:00 2001 From: Riddhi Agrawal Date: Tue, 23 Jan 2024 12:18:43 +0530 Subject: [PATCH] fix: update useApiFetcher function --- src/hooks/AuthHooks.res | 16 +++------------- src/screens/HyperSwitch/APIUtils/APIUtils.res | 11 ++--------- src/screens/HyperSwitch/Order/OrderUIUtils.res | 8 +------- src/screens/HyperSwitch/Refunds/RefundUtils.res | 8 +------- 4 files changed, 7 insertions(+), 36 deletions(-) diff --git a/src/hooks/AuthHooks.res b/src/hooks/AuthHooks.res index 15b66147a..bd4440a0b 100644 --- a/src/hooks/AuthHooks.res +++ b/src/hooks/AuthHooks.res @@ -10,7 +10,7 @@ type sessionStorage = { external dictToObj: Js.Dict.t<'a> => {..} = "%identity" @val external atob: string => string = "atob" -let getHeaders = (~uri, ~headers, ~isFromFormData, ()) => { +let getHeaders = (~uri, ~headers, ()) => { let hyperSwitchToken = LocalStorage.getItem("login")->Js.Nullable.toOption let isMixpanel = uri->String.includes("mixpanel") @@ -20,11 +20,6 @@ let getHeaders = (~uri, ~headers, ~isFromFormData, ()) => { "accept": "application/json", } Fetch.HeadersInit.make(headerObj) - } else if isFromFormData { - let headerObj = { - "Authorization": `Bearer ${hyperSwitchToken->Belt.Option.getWithDefault("")}`, - } - Fetch.HeadersInit.make(headerObj) } else { let headerObj = headers->Dict.get("api-key")->Option.getWithDefault("")->String.length > 0 @@ -86,7 +81,6 @@ let useApiFetcher = () => { ( uri, ~bodyStr: string="", - ~bodyFormData=None, ~headers=Dict.make(), ~bodyHeader as _=?, ~method_: Fetch.requestMethod, @@ -104,11 +98,7 @@ let useApiFetcher = () => { let body = switch method_ { | Get => resolve(None) - | _ => - switch bodyFormData { - | Some(formDataVal) => resolve(Some(Fetch.BodyInit.makeWithFormData(formDataVal))) - | None => resolve(Some(Fetch.BodyInit.make(bodyStr))) - } + | _ => resolve(Some(Fetch.BodyInit.make(bodyStr))) } body->then(body => { @@ -119,7 +109,7 @@ let useApiFetcher = () => { ~method_, ~body?, ~credentials=SameOrigin, - ~headers=getHeaders(~headers, ~uri, ~isFromFormData=bodyFormData->Option.isSome, ()), + ~headers=getHeaders(~headers, ~uri, ()), (), ), ) diff --git a/src/screens/HyperSwitch/APIUtils/APIUtils.res b/src/screens/HyperSwitch/APIUtils/APIUtils.res index 43ff2696e..b466c8d4a 100644 --- a/src/screens/HyperSwitch/APIUtils/APIUtils.res +++ b/src/screens/HyperSwitch/APIUtils/APIUtils.res @@ -203,7 +203,6 @@ let handleLogout = async ( ~fetchApi as _: ( Js.String2.t, ~bodyStr: string=?, - ~bodyFormData: option=?, ~headers: Js.Dict.t=?, ~bodyHeader: Js.Dict.t=?, ~method_: Fetch.requestMethod, @@ -388,15 +387,9 @@ let useUpdateMethod = (~showErrorToast=true, ()) => { }, }) - async (url, body, method, ~bodyFormData=?, ()) => { + async (url, body, method, ()) => { try { - let res = await fetchApi( - url, - ~method_=method, - ~bodyStr=body->Js.Json.stringify, - ~bodyFormData, - (), - ) + let res = await fetchApi(url, ~method_=method, ~bodyStr=body->Js.Json.stringify, ()) await responseHandler( ~res, ~showErrorToast, diff --git a/src/screens/HyperSwitch/Order/OrderUIUtils.res b/src/screens/HyperSwitch/Order/OrderUIUtils.res index 1bf64ac13..a0b9174f5 100644 --- a/src/screens/HyperSwitch/Order/OrderUIUtils.res +++ b/src/screens/HyperSwitch/Order/OrderUIUtils.res @@ -213,13 +213,7 @@ let setData = ( let getOrdersList = async ( filterValueJson, - ~updateDetails: ( - string, - Js.Json.t, - Fetch.requestMethod, - ~bodyFormData: Fetch.formData=?, - unit, - ) => promise, + ~updateDetails: (string, Js.Json.t, Fetch.requestMethod, unit) => promise, ~setOrdersData, ~previewOnly, ~setScreenState, diff --git a/src/screens/HyperSwitch/Refunds/RefundUtils.res b/src/screens/HyperSwitch/Refunds/RefundUtils.res index a31b15530..c7b786427 100644 --- a/src/screens/HyperSwitch/Refunds/RefundUtils.res +++ b/src/screens/HyperSwitch/Refunds/RefundUtils.res @@ -1,12 +1,6 @@ let getRefundsList = async ( filterValueJson, - ~updateDetails: ( - string, - Js.Json.t, - Fetch.requestMethod, - ~bodyFormData: Fetch.formData=?, - unit, - ) => promise, + ~updateDetails: (string, Js.Json.t, Fetch.requestMethod, unit) => promise, ~setRefundsData, ~setScreenState, ~offset,