Merge pull request #895 from matrix-org/travis/stop-client-on-logout

Stop syncing when the token is invalid

Author: turt2live

src/sync.js

@@ -445,6 +445,16 @@ SyncApi.prototype._wasLazyLoadingToggled = async function(lazyLoadMembers) {
     return false;
 };
 
+SyncApi.prototype._shouldAbortSync = function(error) {
+    if (err.errcode === "M_UNKNOWN_TOKEN") {
+        // The logout already happened, we just need to stop.
+        console.warn("Token no longer valid - assuming logout");
+        self.stop();
+        return true;
+    }
+    return false;
+};
+
 /**
  * Main entry point
  */
@@ -479,6 +489,7 @@ SyncApi.prototype.sync = function() {
             client.pushRules = result;
         } catch (err) {
             console.error("Getting push rules failed", err);
+            if (self._shouldAbortSync(err)) return;
             // wait for saved sync to complete before doing anything else,
             // otherwise the sync state will end up being incorrect
             debuglog("Waiting for saved sync before retrying push rules...");
@@ -564,6 +575,7 @@ SyncApi.prototype.sync = function() {
             );
         } catch (err) {
             console.error("Getting filter failed", err);
+            if (self._shouldAbortSync(err)) return;
             // wait for saved sync to complete before doing anything else,
             // otherwise the sync state will end up being incorrect
             debuglog("Waiting for saved sync before retrying filter...");
@@ -877,6 +889,10 @@ SyncApi.prototype._onSyncError = function(err, syncOptions) {
     console.error("/sync error %s", err);
     console.error(err);
 
+    if(this._shouldAbortSync(err)) {
+        return;
+    }
+
     this._failedSyncCount++;
     console.log('Number of consecutive failed sync requests:', this._failedSyncCount);