fix logout bug

Han-Zihang · Sep 14, 2017 · cb8a554 · cb8a554
1 parent 352cee2
commit cb8a554
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/src/app.js b/src/app.js
@@ -117,7 +117,7 @@ class App extends Component {
         ipcRenderer.on('os-resume', async() => {
             var session = stores.session;
 
-            console.log('os-resume');
+            console.log('os-resume' + new Date());
             setTimeout(() => {
                 session.checkTimeout(true);
             }, 3000);

diff --git a/src/js/components/Avatar/index.js b/src/js/components/Avatar/index.js
@@ -2,7 +2,6 @@
 import React, { Component, PropTypes } from 'react';
 import clazz from 'classname';
 
-import blacklist from 'utils/blacklist';
 import './style.global.css';
 
 export default class Avatar extends Component {
@@ -28,7 +27,6 @@ export default class Avatar extends Component {
 
         return (
             <img
-                {...blacklist(this.props, 'fallback', 'className', 'onLoad', 'onError')}
                 className={clazz('Avatar', 'fade fadein', this.props.className)}
                 onLoad={e => this.handleLoad(e)}
                 onError={e => this.handleError(e)} />

diff --git a/src/js/stores/session.js b/src/js/stores/session.js
@@ -204,19 +204,19 @@ class Session {
     }
 
     // A callback for cancel the sync request
-    syncTimeout = window.Function;
+    cancelCheck = window.Function;
 
     checkTimeout(weakup) {
         // Kill the zombie request or duplicate request
-        self.syncTimeout();
+        self.cancelCheck();
         clearTimeout(self.checkTimeout.timer);
 
         if (helper.isSuspend() || weakup) {
             return;
         }
 
         self.checkTimeout.timer = setTimeout(() => {
-            self.syncTimeout();
+            self.cancelCheck();
         }, 30 * 1000);
     }
 
@@ -239,7 +239,7 @@ class Session {
             var response = await axios.get(`${host}cgi-bin/mmwebwx-bin/synccheck`, {
                 cancelToken: new CancelToken(exe => {
                     // An executor function receives a cancel function as a parameter
-                    this.syncTimeout = exe;
+                    this.cancelCheck = exe;
                 }),
                 params: {
                     r: +new Date(),
@@ -309,10 +309,17 @@ class Session {
     @action async logout() {
         var auth = self.auth;
 
-        await axios.post(`/cgi-bin/mmwebwx-bin/webwxlogout?skey=${auth.skey}&redirect=0&type=1`, {
-            sid: auth.sid,
-            uin: auth.uid,
-        });
+        try {
+            await axios.post(`/cgi-bin/mmwebwx-bin/webwxlogout?skey=${auth.skey}&redirect=0&type=1`, {
+                sid: auth.sid,
+                uin: auth.uid,
+            });
+        } finally {
+            self.exit();
+        }
+    }
+
+    async exit() {
         await storage.remove('auth');
         window.location.reload();
     }