Merge pull request #723 from StackStorm/fix/st2web-http

Fix st2web to also work on http
StackStorm · Jun 4, 2019 · 6247b56 · 6247b56
2 parents 263ffda + 5d0cd83
commit 6247b56
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/modules/st2-api/api.js b/modules/st2-api/api.js
@@ -65,9 +65,9 @@ export class API {
     }
     else {
       this.server = {
-        api: `https://${window.location.host}/api`,
-        auth: `https://${window.location.host}/auth`,
-        stream: `https://${window.location.host}/stream`,
+        api: `${window.location.protocol || 'https:'}//${window.location.host}/api`,
+        auth: `${window.location.protocol || 'https:'}//${window.location.host}/auth`,
+        stream: `${window.location.protocol || 'https:'}//${window.location.host}/stream`,
         token: !_.isEmpty(token) ? token : null,
       };
     }

diff --git a/modules/st2-api/tests/test-api.js b/modules/st2-api/tests/test-api.js
@@ -24,6 +24,27 @@ describe('API', () => {
     window.location.host = host; // restore initial value
   });
 
+  describe('can work with http', () => {
+    // capture initial value
+    const host = window.location.host;
+    const protocol = window.location.protocol;
+
+    // set test value
+    window.location.host = 'www.example.net:1234';
+    window.location.protocol = 'http:';
+
+    const api = new API();
+    api.connect();
+
+    expect(api.server.api).to.equal('http://www.example.net:1234/api');
+    expect(api.server.auth).to.equal('http://www.example.net:1234/auth');
+    expect(api.server.stream).to.equal('http://www.example.net:1234/stream');
+
+    // restore initial value
+    window.location.host = host;
+    window.location.protocol = protocol;
+  });
+
   describe('connect', () => {
     before(() => moxios.install());
     after(() => moxios.uninstall());