Add payloads to delete requests (#5187)

packages/sdk/src/base/transport/axios-transport.ts

@@ -35,63 +35,33 @@ export class AxiosTransport implements ITransport {
 	}
 
 	private async request<T = any, R = any>(
-		method: 'get',
+		method: TransportMethods,
 		path: string,
+		data?: any,
 		options?: TransportOptions
-	): Promise<TransportResponse<T, R>>;
-	private async request<T = any, R = any>(
-		method: 'delete',
-		path: string,
-		options?: TransportOptions
-	): Promise<TransportResponse<T, R>>;
-	private async request<T = any, R = any>(
-		method: 'head',
-		path: string,
-		options?: TransportOptions
-	): Promise<TransportResponse<T, R>>;
-	private async request<T = any, R = any>(
-		method: 'options',
-		path: string,
-		options?: TransportOptions
-	): Promise<TransportResponse<T, R>>;
-	private async request<T = any, D = any, R = any>(
-		method: 'post',
-		path: string,
-		data?: D,
-		options?: TransportOptions
-	): Promise<TransportResponse<T, R>>;
-	private async request<T = any, D = any, R = any>(
-		method: 'put',
-		path: string,
-		data?: D,
-		options?: TransportOptions
-	): Promise<TransportResponse<T, R>>;
-	private async request<T = any, D = any, R = any>(
-		method: 'patch',
-		path: string,
-		data?: D,
-		options?: TransportOptions
-	): Promise<TransportResponse<T, R>>;
-	private async request<M extends TransportMethods, T = any, R = any>(
-		method: M,
-		path: string,
-		...args: any
 	): Promise<TransportResponse<T, R>> {
 		try {
-			const make = this.axios[method] as AxiosInstance[M];
-			const response = await make<TransportResponse<T>>(path, ...args);
-			const { data, meta, errors } = response.data;
+			options = options || {};
+			const response = await this.axios.request({
+				method,
+				url: path,
+				data: data,
+				params: options.params,
+				headers: options.headers,
+			});
+
+			const responseData = response.data;
 			const content = {
 				raw: response.data as any,
 				status: response.status,
 				statusText: response.statusText,
 				headers: response.headers,
-				data,
-				meta,
-				errors,
+				data: responseData.data,
+				meta: responseData.meta,
+				errors: responseData.errors,
 			};
 
-			if (errors) {
+			if (responseData.errors) {
 				throw new TransportError<T, R>(null, content);
 			}
 
@@ -114,19 +84,19 @@ export class AxiosTransport implements ITransport {
 	}
 
 	async get<T = any>(path: string, options?: TransportOptions): Promise<TransportResponse<T>> {
-		return await this.request('get', path, options);
-	}
-
-	async delete<T = any>(path: string, options?: TransportOptions): Promise<TransportResponse<T>> {
-		return await this.request('delete', path, options);
+		return await this.request('get', path, undefined, options);
 	}
 
 	async head<T = any>(path: string, options?: TransportOptions): Promise<TransportResponse<T>> {
-		return await this.request('head', path, options);
+		return await this.request('head', path, undefined, options);
 	}
 
 	async options<T = any>(path: string, options?: TransportOptions): Promise<TransportResponse<T>> {
-		return await this.request('options', path, options);
+		return await this.request('options', path, undefined, options);
+	}
+
+	async delete<T = any, D = any>(path: string, data?: D, options?: TransportOptions): Promise<TransportResponse<T>> {
+		return await this.request('delete', path, data, options);
 	}
 
 	async put<T = any, D = any>(path: string, data?: D, options?: TransportOptions): Promise<TransportResponse<T>> {

packages/sdk/src/transport.ts

@@ -21,6 +21,7 @@ export type TransportMethods = 'get' | 'delete' | 'head' | 'options' | 'post' |
 
 export type TransportOptions = {
 	params?: any;
+	headers?: any;
 };
 
 export interface ITransport {

packages/sdk/tests/base/transport/axios.test.ts

@@ -115,7 +115,7 @@ describe('axios transport', function () {
 	it('non axios errors are set in parent', async function () {
 		const storage = new MemoryStorage();
 		const transport = new AxiosTransport(URL, storage);
-		const mock = jest.spyOn(transport.axios, 'get');
+		const mock = jest.spyOn(transport.axios, 'request');
 		mock.mockImplementation(() => {
 			throw new Error('this is not an axios error');
 		});

packages/sdk/tests/items.test.ts

@@ -281,7 +281,7 @@ describe('items', function () {
 	});
 
 	test(`delete many item`, async (url, nock) => {
-		const scope = nock().delete('/items/posts').reply(204);
+		const scope = nock().delete('/items/posts', [1, 2]).reply(204);
 
 		const sdk = new Directus<Blog>(url);
 		await sdk.items('posts').deleteMany([1, 2]);