update support for wss (#122)

Signed-off-by: Caroline Church <caroline.church@uk.ibm.com>
hyperledger-archives · Mar 13, 2018 · 7437f8f · 7437f8f
1 parent 9a10285
commit 7437f8f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/...ages/vehicle-manufacture-manufacturing/client/app/views/dashboard/dashboard.controller.js b/...ages/vehicle-manufacture-manufacturing/client/app/views/dashboard/dashboard.controller.js
@@ -105,7 +105,7 @@ angular.module('bc-manufacturer')
     }
     console.log(' Connecting to websocket', wsUri);
     var webSocketURL = wsUri;
-    let websocket = new WebSocket(webSocketURL);
+    var websocket = new WebSocket(webSocketURL);
     websocket.onopen = function () {
       console.log('Websocket is open');
     }

diff --git a/packages/vehicle-manufacture-vda/client/app/directives/header/header.directive.js b/packages/vehicle-manufacture-vda/client/app/directives/header/header.directive.js
@@ -37,8 +37,8 @@ angular.module('bc-vda')
         return route === location.path();
       }
 
-      let destroyed = false;
-      let websocket;
+      var destroyed = false;
+      var websocket;
 
       function openWebSocket() {
         var wsUri = '';

diff --git a/packages/vehicle-manufacture-vda/client/app/views/dashboard/dashboard.controller.js b/packages/vehicle-manufacture-vda/client/app/views/dashboard/dashboard.controller.js
@@ -84,9 +84,16 @@ angular.module('bc-vda')
 
   // Websockets
   var destroyed = false;
-  let websocket;
+  var websocket;
   function openWebSocket() {
-    var webSocketURL = 'ws://' + location.host;
+    var wsUri = '';
+    if (location.protocol === 'https:') {
+      wsUri = 'wss://' + location.host;
+    } else {
+      wsUri = 'ws://' + location.hostname + ':' + location.port;
+    }
+    console.log(' Connecting to websocket', wsUri);
+    var webSocketURL = wsUri;
     websocket = new WebSocket(webSocketURL);
 
     websocket.onopen = function () {