@dvsa/appdev-api-common 0.10.2 → 0.10.3-1

package/http/index.d.ts

@@ -18,7 +18,7 @@ export declare class HTTP {
      * @param url
      * @param options
      */
-    static get(url: string, options?: RequestInit): Promise<HTTPResponse>;
+    static get(url: string, options?: Omit<RequestInit, "method" | "body">): Promise<HTTPResponse>;
     /**
      * Performs an HTTP POST request.
      * Note: This method will throw an HTTPError if the response is not ok (status code 200-299) to emulate Axios behaviour.
@@ -26,7 +26,7 @@ export declare class HTTP {
      * @param body
      * @param options
      */
-    static post<T>(url: string, body: T, options?: RequestInit): Promise<HTTPResponse>;
+    static post<T>(url: string, body: T, options?: Omit<RequestInit, "method" | "body">): Promise<HTTPResponse>;
     /**
      * Performs an HTTP PUT request.
      * Note: This method will throw an HTTPError if the response is not ok (status code 200-299) to emulate Axios behaviour.
@@ -34,14 +34,15 @@ export declare class HTTP {
      * @param body
      * @param options
      */
-    static put<T>(url: string, body: T, options?: RequestInit): Promise<HTTPResponse>;
+    static put<T>(url: string, body: T, options?: Omit<RequestInit, "method" | "body">): Promise<HTTPResponse>;
     /**
      * Performs an HTTP DELETE request.
      * Note: This method will throw an HTTPError if the response is not ok (status code 200-299) to emulate Axios behaviour.
      * @param url
      * @param options
      */
-    static delete(url: string, options?: RequestInit): Promise<HTTPResponse>;
+    static delete(url: string, options?: Omit<RequestInit, "method" | "body">): Promise<HTTPResponse>;
     private static serialise;
+    private static prepareBody;
 }
 export {};

package/http/index.js

@@ -35,11 +35,15 @@ class HTTP {
      * @param options
      */
     static async post(url, body, options) {
+        const { contentType, processedBody } = HTTP.prepareBody(body);
         const response = await fetch(url, {
-            method: "POST",
-            headers: { "Content-Type": "application/json", ...options?.headers },
-            body: JSON.stringify(body),
             ...options,
+            method: "POST",
+            headers: {
+                ...(contentType && { "Content-Type": contentType }),
+                ...options?.headers,
+            },
+            body: processedBody,
         });
         const serialisedResponse = await HTTP.serialise(response);
         if (!response.ok) {
@@ -55,11 +59,15 @@ class HTTP {
      * @param options
      */
     static async put(url, body, options) {
+        const { contentType, processedBody } = HTTP.prepareBody(body);
         const response = await fetch(url, {
-            method: "PUT",
-            headers: { "Content-Type": "application/json", ...options?.headers },
-            body: JSON.stringify(body),
             ...options,
+            method: "PUT",
+            headers: {
+                ...(contentType && { "Content-Type": contentType }),
+                ...options?.headers,
+            },
+            body: processedBody,
         });
         const serialisedResponse = await HTTP.serialise(response);
         if (!response.ok) {
@@ -106,5 +114,26 @@ class HTTP {
             body,
         };
     }
+    static prepareBody(body) {
+        if (body instanceof FormData) {
+            return { contentType: undefined, processedBody: body };
+        }
+        if (body instanceof URLSearchParams) {
+            return {
+                contentType: "application/x-www-form-urlencoded",
+                processedBody: body,
+            };
+        }
+        if (typeof body === "string") {
+            return {
+                contentType: "text/plain",
+                processedBody: body,
+            };
+        }
+        return {
+            contentType: "application/json",
+            processedBody: JSON.stringify(body),
+        };
+    }
 }
 exports.HTTP = HTTP;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dvsa/appdev-api-common",
-	"version": "0.10.2",
+	"version": "0.10.3-1",
 	"keywords": ["dvsa", "nodejs", "typescript"],
 	"author": "DVSA",
 	"repository": {