From e285839ee1322b8f16bdd15b76ef2d0f62bf154f Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Mon, 26 Jun 2017 11:39:24 -0400
Subject: [PATCH] Fix websocket URL when specifying port in the config (#6748)

---
 webapp/actions/websocket_actions.jsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/webapp/actions/websocket_actions.jsx b/webapp/actions/websocket_actions.jsx
index 1cdd065995..72be226ccf 100644
--- a/webapp/actions/websocket_actions.jsx
+++ b/webapp/actions/websocket_actions.jsx
@@ -31,6 +31,7 @@ const getState = store.getState;
 
 import {batchActions} from 'redux-batched-actions';
 import {Client4} from 'mattermost-redux/client';
+import {getSiteURL} from 'utils/url.jsx';
 
 import * as TeamActions from 'mattermost-redux/actions/teams';
 import {viewChannel, getChannelAndMyMember, getChannelStats} from 'mattermost-redux/actions/channels';
@@ -46,7 +47,7 @@ export function initialize() {
         return;
     }
 
-    let connUrl = Client4.getWebSocketUrl();
+    let connUrl = getSiteURL();
 
     // replace the protocol with a websocket one
     if (connUrl.startsWith('https:')) {
@@ -56,7 +57,7 @@ export function initialize() {
     }
 
     // append a port number if one isn't already specified
-    if (!(/:\d+/).test(connUrl)) {
+    if (!(/:\d+$/).test(connUrl)) {
         if (connUrl.startsWith('wss:')) {
             connUrl += ':' + global.window.mm_config.WebsocketSecurePort;
         } else {
@@ -64,6 +65,8 @@ export function initialize() {
         }
     }
 
+    connUrl += Client4.getUrlVersion() + '/websocket';
+
     WebSocketClient.setEventCallback(handleEvent);
     WebSocketClient.setFirstConnectCallback(handleFirstConnect);
     WebSocketClient.setReconnectCallback(() => reconnect(false));