diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-08-23 13:34:14 +0200 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-08-23 13:34:14 +0200 |
| commit | fb1f92d111cd752a6b9edafc8dff58d5b8a59042 (patch) | |
| tree | 33bfda12fe7954ba86ba72d9e49ceeafccc999f1 /app | |
| parent | da4f2903b14dbd09b088e44d6acf58d91d3df990 (diff) | |
| parent | 87179385e5ecba924bef4eef749631c7816aaeca (diff) | |
| download | mullvadvpn-fb1f92d111cd752a6b9edafc8dff58d5b8a59042.tar.xz mullvadvpn-fb1f92d111cd752a6b9edafc8dff58d5b8a59042.zip | |
Merge branch 'autologin-ux-fix'
Diffstat (limited to 'app')
| -rw-r--r-- | app/lib/backend.js | 2 | ||||
| -rw-r--r-- | app/redux/account/actions.js | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/lib/backend.js b/app/lib/backend.js index 2d39d4b7cd..6d5c4ebd14 100644 --- a/app/lib/backend.js +++ b/app/lib/backend.js @@ -204,7 +204,7 @@ export class Backend { .catch( e => { log.warn('Unable to autologin', e); - this._store.dispatch(accountActions.loginFailed(new BackendError('INVALID_ACCOUNT'))); + this._store.dispatch(accountActions.autoLoginFailed()); this._store.dispatch(push('/')); }); } diff --git a/app/redux/account/actions.js b/app/redux/account/actions.js index ea0d369125..fb45109471 100644 --- a/app/redux/account/actions.js +++ b/app/redux/account/actions.js @@ -51,7 +51,11 @@ function loggedOut(): LoggedOutAction { }; } +function autoLoginFailed(): LoggedOutAction { + return loggedOut(); +} + const login = (backend: Backend, account: string) => () => backend.login(account); const logout = (backend: Backend) => () => backend.logout(); -export default { login, logout, startLogin, loginSuccessful, loginFailed, loggedOut }; +export default { login, logout, startLogin, loginSuccessful, loginFailed, loggedOut, autoLoginFailed }; |
