refactor: re-type interceptors for axios@1.6.0
This commit is contained in:
@@ -1,5 +1,5 @@
|
|||||||
import { IHttpClientParams } from '@automatisch/types';
|
import { IHttpClientParams } from '@automatisch/types';
|
||||||
import { AxiosRequestConfig } from 'axios';
|
import { InternalAxiosRequestConfig } from 'axios';
|
||||||
import { URL } from 'node:url';
|
import { URL } from 'node:url';
|
||||||
export { AxiosInstance as IHttpClient } from 'axios';
|
export { AxiosInstance as IHttpClient } from 'axios';
|
||||||
|
|
||||||
@@ -7,8 +7,8 @@ import HttpError from '../../errors/http';
|
|||||||
import axios from '../axios-with-proxy';
|
import axios from '../axios-with-proxy';
|
||||||
|
|
||||||
const removeBaseUrlForAbsoluteUrls = (
|
const removeBaseUrlForAbsoluteUrls = (
|
||||||
requestConfig: AxiosRequestConfig
|
requestConfig: InternalAxiosRequestConfig
|
||||||
): AxiosRequestConfig => {
|
): InternalAxiosRequestConfig => {
|
||||||
try {
|
try {
|
||||||
const url = new URL(requestConfig.url);
|
const url = new URL(requestConfig.url);
|
||||||
requestConfig.baseURL = url.origin;
|
requestConfig.baseURL = url.origin;
|
||||||
@@ -30,12 +30,21 @@ export default function createHttpClient({
|
|||||||
});
|
});
|
||||||
|
|
||||||
instance.interceptors.request.use(
|
instance.interceptors.request.use(
|
||||||
(requestConfig: AxiosRequestConfig): AxiosRequestConfig => {
|
(requestConfig: InternalAxiosRequestConfig): InternalAxiosRequestConfig => {
|
||||||
const newRequestConfig = removeBaseUrlForAbsoluteUrls(requestConfig);
|
const newRequestConfig = removeBaseUrlForAbsoluteUrls(requestConfig);
|
||||||
|
|
||||||
return beforeRequest.reduce((newConfig, beforeRequestFunc) => {
|
const result = beforeRequest.reduce((newConfig, beforeRequestFunc) => {
|
||||||
return beforeRequestFunc($, newConfig);
|
return beforeRequestFunc($, newConfig);
|
||||||
}, newRequestConfig);
|
}, newRequestConfig);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* axios seems to want InternalAxiosRequestConfig returned not AxioRequestConfig
|
||||||
|
* anymore even though requests do require AxiosRequestConfig.
|
||||||
|
*
|
||||||
|
* Since both interfaces are very similar (InternalAxiosRequestConfig
|
||||||
|
* extends AxiosRequestConfig), we can utilize an assertion below
|
||||||
|
**/
|
||||||
|
return result as InternalAxiosRequestConfig;
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user