From 1fc12dd8ba2238eba7d154eee55e1381e7415372 Mon Sep 17 00:00:00 2001
From: =Corey Hulen <corey@hulen.com>
Date: Tue, 20 Oct 2015 14:49:42 -0700
Subject: Multi-session login

---
 web/react/stores/socket_store.jsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'web/react/stores/socket_store.jsx')

diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx
index 77951f214..33cdc79fb 100644
--- a/web/react/stores/socket_store.jsx
+++ b/web/react/stores/socket_store.jsx
@@ -38,6 +38,10 @@ class SocketStoreClass extends EventEmitter {
             return;
         }
 
+        if (!global.window.mm_session_token_index) {
+            return;
+        }
+
         this.setMaxListeners(0);
 
         if (window.WebSocket && !conn) {
@@ -45,7 +49,9 @@ class SocketStoreClass extends EventEmitter {
             if (window.location.protocol === 'https:') {
                 protocol = 'wss://';
             }
-            var connUrl = protocol + location.host + '/api/v1/websocket';
+
+            var connUrl = protocol + location.host + '/api/v1/websocket?' + Utils.getSessionIndex();
+
             if (this.failCount === 0) {
                 console.log('websocket connecting to ' + connUrl); //eslint-disable-line no-console
             }
-- 
cgit v1.2.3-1-g7c22


From cc25355af79fcfeea2b59e97468ef812e1007aa8 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Fri, 23 Oct 2015 08:55:45 -0400
Subject: Fix websocket not connecting when session index is 0

---
 web/react/stores/socket_store.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'web/react/stores/socket_store.jsx')

diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx
index 33cdc79fb..8c3489001 100644
--- a/web/react/stores/socket_store.jsx
+++ b/web/react/stores/socket_store.jsx
@@ -38,7 +38,7 @@ class SocketStoreClass extends EventEmitter {
             return;
         }
 
-        if (!global.window.mm_session_token_index) {
+        if (!global.window.hasOwnProperty('mm_session_token_index')) {
             return;
         }
 
-- 
cgit v1.2.3-1-g7c22

