summaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@codeispoetry.ru>2017-02-28 14:28:32 +0000
committerAndrej Mihajlov <and@codeispoetry.ru>2017-02-28 14:28:32 +0000
commit5d2ebe06a0cd9fc50942bc068c73f37cc298e0cc (patch)
treeaa8fcf0154a7154cf70dc203d7dac881be060f1a /app
parent4f8e1f3c3c1fd38904a9c5b46d15a04deeed244f (diff)
downloadmullvadvpn-5d2ebe06a0cd9fc50942bc068c73f37cc298e0cc.tar.xz
mullvadvpn-5d2ebe06a0cd9fc50942bc068c73f37cc298e0cc.zip
Backend: Automatically disconnect() on logout()
Diffstat (limited to 'app')
-rw-r--r--app/lib/backend-redux-actions.js3
-rw-r--r--app/lib/backend.js3
2 files changed, 3 insertions, 3 deletions
diff --git a/app/lib/backend-redux-actions.js b/app/lib/backend-redux-actions.js
index 09811e19cf..bef61f2579 100644
--- a/app/lib/backend-redux-actions.js
+++ b/app/lib/backend-redux-actions.js
@@ -64,9 +64,6 @@ export default function mapBackendEventsToReduxActions(backend, store) {
// return to login screen
store.dispatch(replace('/'));
-
- // disconnect when user logged out
- backend.disconnect();
};
backend.on(Backend.EventType.updatedIp, onUpdateIp);
diff --git a/app/lib/backend.js b/app/lib/backend.js
index b0f851f9bb..9467d9736b 100644
--- a/app/lib/backend.js
+++ b/app/lib/backend.js
@@ -84,6 +84,9 @@ export default class Backend extends EventEmitter {
// emit event
this.emit(EventType.logout);
+ // disconnect user during logout
+ this.disconnect();
+
// @TODO: Add logout call
}