src/axios.ts

@@ -1,5 +1,5 @@
-import Axios, { AxiosError, AxiosRequestConfig } from "axios";
+import Axios, {AxiosError, AxiosRequestConfig} from "axios";
-import { S5Error } from "./client.js";
+import {S5Error} from "./client.js";
 
 export interface CancelablePromise<T> extends Promise<T> {
     cancel: () => void;
@@ -9,7 +9,7 @@ export const customInstance = <T>(
     config: AxiosRequestConfig,
     options?: AxiosRequestConfig,
 ): CancelablePromise<T> => {
-  const abort = new AbortController();
+    const source = Axios.CancelToken.source();
 
     /*
       Hack to ensure that the data is passed to the request as an option.
@@ -20,26 +20,21 @@ export const customInstance = <T>(
         delete config.data;
     }
 
-  const instance = Axios.create({ baseURL: options?.baseURL });
+    const instance = Axios.create({baseURL: options?.baseURL});
     const promise = instance({
-      signal: abort.signal,
         ...config,
         ...options,
-  })
+        cancelToken: source.token,
-    .then(({ data }) => data)
+    }).then(({data}) => data).catch((error) => {
-    .catch((error) => {
         if (Axios.isCancel(error)) {
             return;
         }
-      throw new S5Error(
+        throw new S5Error((error as AxiosError).message, (error as AxiosError).response?.status as number);
-        (error as AxiosError).message,
+    })
-        (error as AxiosError).response?.status as number,
-      );
-    });
 
     // @ts-ignore
     promise.cancel = () => {
-      abort.abort("Query was cancelled");
+        source.cancel("Query was cancelled");
     };
 
     return promise as CancelablePromise<T>;

src/utils/options.ts

@@ -18,7 +18,6 @@ export type CustomClientOptions = {
   customCookie?: string;
   onDownloadProgress?: (progressEvent: AxiosProgressEvent) => void;
   onUploadProgress?: (progressEvent: AxiosProgressEvent) => void;
-  httpConfig?: AxiosRequestConfig;
 };
 
 export function optionsToConfig(
@@ -30,7 +29,7 @@ export function optionsToConfig(
     | CustomRegistryOptions
   )[]
 ): AxiosRequestConfig {
-  let config: AxiosRequestConfig = {};
+  const config: AxiosRequestConfig = {};
 
   config.baseURL = client.portalUrl;
 
@@ -76,12 +75,5 @@ export function optionsToConfig(
 
   config.headers = headers;
 
-  if (finalOptions?.httpConfig) {
-    config = {
-      ...config,
-      ...finalOptions.httpConfig,
-    };
-  }
-
   return config;
 }