diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-09-29 13:16:23 +0200 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-10-05 13:47:18 +0200 |
| commit | 7aa405045e4e6a60eb75b428abaf1493712629c8 (patch) | |
| tree | b2c7253db7b5df5c14c30c0558bb70b60d46ba2b /app | |
| parent | 44dcf8c58a827b5ab1bfa82f194920cefa510a0a (diff) | |
| download | mullvadvpn-7aa405045e4e6a60eb75b428abaf1493712629c8.tar.xz mullvadvpn-7aa405045e4e6a60eb75b428abaf1493712629c8.zip | |
Move autologin connect into the backend
Diffstat (limited to 'app')
| -rw-r--r-- | app/app.js | 6 | ||||
| -rw-r--r-- | app/lib/backend.js | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/app/app.js b/app/app.js index e28d85582e..4886e42527 100644 --- a/app/app.js +++ b/app/app.js @@ -27,12 +27,6 @@ ipcRenderer.on('backend-info', (_event, args) => { backend.setLocation(args.addr); backend.sync(); backend.autologin() - .then( () => { - if(store.getState().settings.autoSecure) { - log.info('Autoconnecting...'); - backend.connect(); - } - }) .catch( e => { if (e.type === 'NO_ACCOUNT') { log.debug('No user set in the backend, showing window'); diff --git a/app/lib/backend.js b/app/lib/backend.js index 270d1e2a92..e159ca51df 100644 --- a/app/lib/backend.js +++ b/app/lib/backend.js @@ -179,6 +179,7 @@ export class Backend { this._store.dispatch(accountActions.loginSuccessful(accountData.expiry)); this._store.dispatch(push('/connect')); + this.connect(); }) .catch( e => { log.warn('Unable to autologin,', e.message); |