From 34780f3aea78bbf5dd35230ba7ad4a67618b42a0 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Mon, 16 May 2016 19:09:37 -0400
Subject: Refresh login page if server version of client doesn't match browser
 version of client (#3004)

---
 webapp/utils/async_client.jsx | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

(limited to 'webapp/utils')

diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx
index 6535c024d..7ddf299f6 100644
--- a/webapp/utils/async_client.jsx
+++ b/webapp/utils/async_client.jsx
@@ -47,7 +47,21 @@ function isCallInProgress(callName) {
     return true;
 }
 
-export function getChannels(checkVersion) {
+export function checkVersion() {
+    var serverVersion = Client.getServerVersion();
+
+    if (serverVersion !== BrowserStore.getLastServerVersion()) {
+        if (!BrowserStore.getLastServerVersion() || BrowserStore.getLastServerVersion() === '') {
+            BrowserStore.setLastServerVersion(serverVersion);
+        } else {
+            BrowserStore.setLastServerVersion(serverVersion);
+            window.location.reload(true);
+            console.log('Detected version update refreshing the page'); //eslint-disable-line no-console
+        }
+    }
+}
+
+export function getChannels(doVersionCheck) {
     if (isCallInProgress('getChannels')) {
         return null;
     }
@@ -58,18 +72,8 @@ export function getChannels(checkVersion) {
         (data) => {
             callTracker.getChannels = 0;
 
-            if (checkVersion) {
-                var serverVersion = Client.getServerVersion();
-
-                if (serverVersion !== BrowserStore.getLastServerVersion()) {
-                    if (!BrowserStore.getLastServerVersion() || BrowserStore.getLastServerVersion() === '') {
-                        BrowserStore.setLastServerVersion(serverVersion);
-                    } else {
-                        BrowserStore.setLastServerVersion(serverVersion);
-                        window.location.reload(true);
-                        console.log('Detected version update refreshing the page'); //eslint-disable-line no-console
-                    }
-                }
+            if (doVersionCheck) {
+                checkVersion();
             }
 
             AppDispatcher.handleServerAction({
-- 
cgit v1.2.3-1-g7c22