From ac52810ef624e1e37f653413411767dda6f1c5b6 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 29 Sep 2019 15:32:22 -0700
Subject: [PATCH] Don't try to parse JSON being returned from the API

---
 app/Http/Controllers/Api/Client/Servers/FileController.php | 4 +++-
 resources/scripts/api/server/files/getFileContents.ts      | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/Api/Client/Servers/FileController.php b/app/Http/Controllers/Api/Client/Servers/FileController.php
index 0dbd6ca89..5ad07ecee 100644
--- a/app/Http/Controllers/Api/Client/Servers/FileController.php
+++ b/app/Http/Controllers/Api/Client/Servers/FileController.php
@@ -85,7 +85,9 @@ class FileController extends ClientApiController
         return Response::create(
             $this->fileRepository->setServer($server)->getContent(
                 $request->get('file'), config('pterodactyl.files.max_edit_size')
-            )
+            ),
+            Response::HTTP_OK,
+            ['Content-Type' => 'text/plain']
         );
     }
 
diff --git a/resources/scripts/api/server/files/getFileContents.ts b/resources/scripts/api/server/files/getFileContents.ts
index d35f0575d..efaedd3bb 100644
--- a/resources/scripts/api/server/files/getFileContents.ts
+++ b/resources/scripts/api/server/files/getFileContents.ts
@@ -2,7 +2,11 @@ import http from '@/api/http';
 
 export default (server: string, file: string): Promise<string> => {
     return new Promise((resolve, reject) => {
-        http.get(`/api/client/servers/${server}/files/contents`, { params: { file } })
+        http.get(`/api/client/servers/${server}/files/contents`, {
+            params: { file },
+            transformResponse: res => res,
+            responseType: 'text/plain',
+        })
             .then(({ data }) => resolve(data))
             .catch(reject);
     });