From 28a6c0b892c8d059e1176e21457a36b06130e543 Mon Sep 17 00:00:00 2001
From: Trevor Johnston <trevj@users.noreply.github.com>
Date: Mon, 3 Dec 2018 15:54:02 -0500
Subject: [PATCH] strip whitespace from server configs, like we used to

---
 src/server_manager/web_app/management_urls.spec.ts | 14 ++++++++++++++
 src/server_manager/web_app/management_urls.ts      |  3 +++
 2 files changed, 17 insertions(+)

diff --git a/src/server_manager/web_app/management_urls.spec.ts b/src/server_manager/web_app/management_urls.spec.ts
index 4948bdcd..80c27a01 100644
--- a/src/server_manager/web_app/management_urls.spec.ts
+++ b/src/server_manager/web_app/management_urls.spec.ts
@@ -46,4 +46,18 @@ describe('parseManualServerConfig', () => {
     expect(result.apiUrl).toEqual('http://abc.com/xyz');
     expect(result.certSha256).toEqual('1234567');
   });
+
+  it('strips whitespace', () => {
+    const result =
+        parseManualServerConfig('{"apiUrl":http://abc.com/xyz, "certSha256":"123   4567"}');
+    expect(result.apiUrl).toEqual('http://abc.com/xyz');
+    expect(result.certSha256).toEqual('1234567');
+  });
+
+  it('strips newlines', () => {
+    const result =
+        parseManualServerConfig('{"apiUrl":http://abc.com/xyz, "certSha256":"123\n4567"}');
+    expect(result.apiUrl).toEqual('http://abc.com/xyz');
+    expect(result.certSha256).toEqual('1234567');
+  });
 });
\ No newline at end of file
diff --git a/src/server_manager/web_app/management_urls.ts b/src/server_manager/web_app/management_urls.ts
index 13b17986..47a50f6c 100644
--- a/src/server_manager/web_app/management_urls.ts
+++ b/src/server_manager/web_app/management_urls.ts
@@ -30,6 +30,9 @@ export function parseManualServerConfig(userInput: string): ManualServerConfig {
     userInput = userInput.substring(0, indexOfLastBrace + 1);
   }
 
+  // Strip whitespace.
+  userInput = userInput.replace(/\s+/g, '');
+
   const config = jsonic(userInput) as ManualServerConfig;
 
   if (!config.apiUrl) {