Fix response type issues

Some endpoints respond with only a string instead of JSON. This commit skips parsing those responses and returns the response text as a string.
GeoffSelby · May 15, 2022 · 05674f5 · 05674f5
1 parent 391609e
commit 05674f5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/Forge.js b/src/Forge.js
@@ -204,6 +204,7 @@ class Forge extends ForgeRequest {
       activate: (serverId, siteId, certId) =>
         this.post(
           `/servers/${serverId}/sites/${siteId}/certificates/${certId}/activate`,
+          {parseResponse: false},
         ),
       delete: (serverId, siteId, certId) =>
         this.delete(
@@ -287,7 +288,7 @@ class Forge extends ForgeRequest {
       disable: (serverId, siteId) =>
         this.delete(`/servers/${serverId}/sites/${siteId}/deployment`),
       getScript: (serverId, siteId) =>
-        this.get(`/servers/${serverId}/sites/${siteId}/deployment/script`),
+        this.get(`/servers/${serverId}/sites/${siteId}/deployment/script`, {parseResponse: false}),
       updateScript: (serverId, siteId, payload) =>
         this.put(
           `/servers/${serverId}/sites/${siteId}/deployment/script`,
@@ -320,13 +321,13 @@ class Forge extends ForgeRequest {
   get config() {
     return {
       getNginx: (serverId, siteId) =>
-        this.get(`/servers/${serverId}/sites/${siteId}/nginx`),
+        this.get(`/servers/${serverId}/sites/${siteId}/nginx`, {parseResponse: false}),
       updateNginx: (serverId, siteId, payload) =>
-        this.put(`/servers/${serverId}/sites/${siteId}/nginx`, payload),
+        this.put(`/servers/${serverId}/sites/${siteId}/nginx`, payload, {parseResponse: false}),
       getEnv: (serverId, siteId) =>
-        this.get(`/servers/${serverId}/sites/${siteId}/env`),
+        this.get(`/servers/${serverId}/sites/${siteId}/env`, {parseResponse: false}),
       updateEnv: (serverId, siteId, payload) =>
-        this.put(`/servers/${serverId}/sites/${siteId}/env`, payload),
+        this.put(`/servers/${serverId}/sites/${siteId}/env`, payload, {parseResponse: false}),
     };
   }
 

diff --git a/src/core/ForgeRequest.js b/src/core/ForgeRequest.js
@@ -21,7 +21,7 @@ class ForgeRequest {
     if (options.parseResponse !== false && res.status !== 204)
       return res.json();
 
-    return undefined;
+    return res.text();
   }
 
   get(endpoint, options = {}) {