fix:addressed review changes

Signed-off-by: Amitkanswal <[email protected]>

Author: Amitkanswal

src/types/api.type.ts

@@ -1,3 +1,3 @@
-import { AxiosRequestConfig, AxiosResponse } from 'axios'
-export type ProxyConfig = AxiosRequestConfig
+import { AxiosRequestConfig, AxiosResponse, } from 'axios'
+export type RequestConfig = AxiosRequestConfig
 export type ProxyResponse = AxiosResponse

src/uiLocation.ts

@@ -34,7 +34,7 @@ import { User } from "./types/user.types";
 import { formatAppRegion, onData, onError } from "./utils/utils";
 import Window from "./window";
 import { dispatchApiRequest, dispatchAdapter } from './utils/adapter';
-import {ProxyConfig, ProxyResponse } from './types/api.type';
+import {RequestConfig, ProxyResponse } from './types/api.type';
 
 const emitter = new EventEmitter();
 
@@ -482,7 +482,7 @@ class UiLocation {
      * Method used to create an adapter for management sdk.
     */
 
-    createAdapter = (config: ProxyConfig) => dispatchAdapter(this.postRobot)(config) as Promise<ProxyResponse>;
+    createAdapter = (config: RequestConfig) => dispatchAdapter(this.postRobot)(config) as Promise<ProxyResponse>;
 
     /**
      * Method used to initialize the App SDK.

src/utils/adapter.ts

@@ -1,6 +1,6 @@
 import PostRobot from 'post-robot';
-import axios, { AxiosRequestConfig, AxiosResponse } from 'axios';
-import { onError, convertHeaders, convertAxiosHeadersToHeadersInit } from './utils';
+import { AxiosRequestConfig, AxiosResponse } from 'axios';
+import { onError, fetchToAxiosConfig } from './utils';
 
 /**
  * Dispatches a request using PostRobot.
@@ -20,34 +20,28 @@ export const dispatchAdapter = (postRobot: typeof PostRobot) => (config: AxiosRe
  * @param options - Optional request options.
  * @returns A promise that resolves to a partial Response object.
  */
-export const dispatchApiRequest = async (url: string, options?: RequestInit): Promise<Partial<Response>> => {
+export const dispatchApiRequest = async (url: string, options?: RequestInit): Promise<Response> => {
   try {
-    const config: AxiosRequestConfig = {
-      url,
-      method: options?.method || "GET",
-      ...(options?.headers && { headers: convertHeaders(options.headers) }),
-      ...(options?.body && { data: options?.body })
-    };
-
+    const config = fetchToAxiosConfig(url, options);
     const responseData = await dispatchAdapter(PostRobot)(config) as AxiosResponse; 
-    const isCallSuccessful = responseData.status >= 200 && responseData.status < 300;
-    const fetchResponse: Partial<Response> = {
-      ok: isCallSuccessful,
+    return new Response(responseData.data,{
       status: responseData.status,
       statusText: responseData.statusText,
-      headers: new Headers(convertAxiosHeadersToHeadersInit(responseData.config.headers || {})),
-      json: async () => responseData.data,
-      text: async () => JSON.stringify(responseData.data),
-    };
+      headers: new Headers(responseData.config.headers || {}),
+    });
 
-    return fetchResponse;
-  } catch (error) {
-    if (axios.isAxiosError(error)) {
-      console.error("API request failed:", error.message);
-      throw new Error(`API request failed: ${error.message}`);
+  } catch (error: any) {
+    if (error.response) {
+      const fetchResponse = new Response(error.response.data, {
+          status: error.response.status,
+          statusText: error.response.statusText,
+          headers: new Headers(error.response.headers) 
+      });
+      return Promise.reject(fetchResponse);
+    } else if (error.request) {
+        return Promise.reject(new Response(null, { status: 0, statusText: 'Network Error' }));
     } else {
-      console.error("An unexpected error occurred:", error);
-      throw new Error("An unexpected error occurred");
+        return Promise.reject(new Response(null, { status: 0, statusText: error.message }));
     }
   }
 };

src/utils/utils.ts

@@ -1,5 +1,5 @@
 import { Region } from "../types";
-import { AxiosHeaders } from "axios";
+import { AxiosHeaders, AxiosRequestConfig } from "axios";
 
 export function onData<Data extends Record<string, any>>(data: { data: Data }) {
     if (typeof data.data === "string") {
@@ -69,10 +69,17 @@ export const convertHeaders = (headers: HeadersInit): AxiosHeaders => {
     return axiosHeaders;
   };
 
-  export const convertAxiosHeadersToHeadersInit = (axiosHeaders: any): HeadersInit => {
-    const headers: HeadersInit = {};
-    Object.keys(axiosHeaders).forEach(key => {
-      headers[key] = axiosHeaders[key];
-    });
-    return headers;
-  };
+  export const fetchToAxiosConfig = (url: string, options: RequestInit = {}): AxiosRequestConfig => {
+    const axiosConfig: AxiosRequestConfig = {
+      url,
+      method: options.method || 'GET',
+      headers: options.headers ? convertHeaders({...options.headers}) : {}, 
+      data: options.body,
+    };
+  
+    if (options.credentials === 'include') {
+      axiosConfig.withCredentials = true;
+    }
+  
+    return axiosConfig;
+  }