Merge remote-tracking branch 'loganbenjamin/master'

Author: bertramr

src/templates/core/ApiRequestOptions.hbs

@@ -10,6 +10,7 @@ export type ApiRequestOptions = {
 	readonly formData?: Record<string, any>;
 	readonly body?: any;
 	readonly mediaType?: string;
+	readonly responseType?: 'blob';
 	readonly responseHeader?: string;
 	readonly errors?: Record<number, string>;
 };

src/templates/core/angular/sendRequest.hbs

@@ -7,10 +7,11 @@ export const sendRequest = <T>(
 	formData: FormData | undefined,
 	headers: HttpHeaders
 ): Observable<HttpResponse<T>> => {
-	return http.request<T>(options.method, url, {
+	return http.request(options.method, url, {
 		headers,
 		body: body ?? formData,
 		withCredentials: config.WITH_CREDENTIALS,
 		observe: 'response',
+		responseType: options.responseType,
 	});
 };

src/templates/core/axios/sendRequest.hbs

@@ -15,6 +15,7 @@ const sendRequest = async <T>(
 		data: body ?? formData,
 		method: options.method,
 		withCredentials: config.WITH_CREDENTIALS,
+		responseType: options.responseType,
 		cancelToken: source.token,
 	};
 

src/templates/core/fetch/getResponseBody.hbs

@@ -1,11 +1,13 @@
-const getResponseBody = async (response: Response): Promise<any> => {
+const getResponseBody = async (response: Response, options: ApiRequestOptions): Promise<any> => {
 	if (response.status !== 204) {
 		try {
 			const contentType = response.headers.get('Content-Type');
 			if (contentType) {
 				const isJSON = contentType.toLowerCase().startsWith('application/json');
 				if (isJSON) {
 					return await response.json();
+				} else if (options.responseType === 'blob') {
+					return await response.blob();
 				} else {
 					return await response.text();
 				}

src/templates/core/fetch/request.hbs

@@ -72,7 +72,7 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): C
 
 			if (!onCancel.isCancelled) {
 				const response = await sendRequest(config, options, url, body, formData, headers, onCancel);
-				const responseBody = await getResponseBody(response);
+				const responseBody = await getResponseBody(response, options);
 				const responseHeader = getResponseHeader(response, options.responseHeader);
 
 				const result: ApiResult = {

src/templates/core/node/getResponseBody.hbs

@@ -1,11 +1,13 @@
-const getResponseBody = async (response: Response): Promise<any> => {
+const getResponseBody = async (response: Response, options: ApiRequestOptions): Promise<any> => {
 	if (response.status !== 204) {
 		try {
 			const contentType = response.headers.get('Content-Type');
 			if (contentType) {
 				const isJSON = contentType.toLowerCase().startsWith('application/json');
 				if (isJSON) {
 					return await response.json();
+				} else if (options.responseType === 'blob') {
+					return await response.blob();
 				} else {
 					return await response.text();
 				}

src/templates/core/node/request.hbs

@@ -75,7 +75,7 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): C
 
 			if (!onCancel.isCancelled) {
 				const response = await sendRequest(options, url, body, formData, headers, onCancel);
-				const responseBody = await getResponseBody(response);
+				const responseBody = await getResponseBody(response, options);
 				const responseHeader = getResponseHeader(response, options.responseHeader);
 
 				const result: ApiResult = {

src/templates/core/xhr/getResponseBody.hbs

@@ -1,11 +1,13 @@
-const getResponseBody = (xhr: XMLHttpRequest): any => {
+const getResponseBody = (xhr: XMLHttpRequest, options: ApiRequestOptions): any => {
 	if (xhr.status !== 204) {
 		try {
 			const contentType = xhr.getResponseHeader('Content-Type');
 			if (contentType) {
 				const isJSON = contentType.toLowerCase().startsWith('application/json');
 				if (isJSON) {
 					return JSON.parse(xhr.responseText);
+				} else if (options.responseType === 'blob') {
+					return xhr.response;
 				} else {
 					return xhr.responseText;
 				}

src/templates/core/xhr/request.hbs

@@ -75,7 +75,7 @@ export const request = <T>(config: OpenAPIConfig, options: ApiRequestOptions): C
 
 			if (!onCancel.isCancelled) {
 				const response = await sendRequest(config, options, url, body, formData, headers, onCancel);
-				const responseBody = getResponseBody(response);
+				const responseBody = getResponseBody(response, options);
 				const responseHeader = getResponseHeader(response, options.responseHeader);
 
 				const result: ApiResult = {

src/templates/core/xhr/sendRequest.hbs

@@ -10,6 +10,7 @@ export const sendRequest = async (
 	const xhr = new XMLHttpRequest();
 	xhr.open(options.method, url, true);
 	xhr.withCredentials = config.WITH_CREDENTIALS;
+	xhr.responseType = options.responseType;
 
 	headers.forEach((value, key) => {
 		xhr.setRequestHeader(key, value);