diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-05-16 19:09:37 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-05-16 16:09:37 -0700 |
| commit | 34780f3aea78bbf5dd35230ba7ad4a67618b42a0 (patch) | |
| tree | 760e5130264177763081760865cf109323e393a2 /webapp/utils | |
| parent | 2ccf5bbaa2421c03cf932431fc0247b43b48d774 (diff) | |
| download | chat-34780f3aea78bbf5dd35230ba7ad4a67618b42a0.tar.gz chat-34780f3aea78bbf5dd35230ba7ad4a67618b42a0.tar.bz2 chat-34780f3aea78bbf5dd35230ba7ad4a67618b42a0.zip | |
Refresh login page if server version of client doesn't match browser version of client (#3004)
Diffstat (limited to 'webapp/utils')
| -rw-r--r-- | webapp/utils/async_client.jsx | 30 |
1 files changed, 17 insertions, 13 deletions
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({ |