summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorErik Larkö <erik@mullvad.net>2017-08-15 15:44:57 +0200
committerErik Larkö <erik@mullvad.net>2017-08-22 13:46:36 +0200
commit87179385e5ecba924bef4eef749631c7816aaeca (patch)
tree33bfda12fe7954ba86ba72d9e49ceeafccc999f1
parentda4f2903b14dbd09b088e44d6acf58d91d3df990 (diff)
downloadmullvadvpn-87179385e5ecba924bef4eef749631c7816aaeca.tar.xz
mullvadvpn-87179385e5ecba924bef4eef749631c7816aaeca.zip
Failed autologins no longer prompts the user with LOGIN FAILED
-rw-r--r--app/lib/backend.js2
-rw-r--r--app/redux/account/actions.js6
-rw-r--r--test/autologin.spec.js8
3 files changed, 10 insertions, 6 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 };
diff --git a/test/autologin.spec.js b/test/autologin.spec.js
index 628dc145eb..0c031b15ca 100644
--- a/test/autologin.spec.js
+++ b/test/autologin.spec.js
@@ -59,9 +59,9 @@ describe('autologin', () => {
.then( () => {
const state = store.getState().account;
- expect(state.status).to.equal('failed');
+ expect(state.status).to.equal('none');
expect(state.accountNumber).to.be.null;
- expect(state.error).not.to.be.null;
+ expect(state.error).to.be.null;
});
});
@@ -75,8 +75,8 @@ describe('autologin', () => {
.then( () => {
const state = store.getState().account;
- expect(state.status).to.equal('failed');
- expect(state.error).not.to.be.null;
+ expect(state.status).to.equal('none');
+ expect(state.error).to.be.null;
});
});