pro/im_webapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change auto-login order: try token first

Browse Source
This commit is contained in:
or-else
2017-08-07 10:06:03 +03:00
parent db8e718002
commit ff0dfed2e8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.html
+4 -4
View File
@@ -2384,14 +2384,14 @@
doLogin: function(login, password) { doLogin: function(login, password) {
var instance = this; var instance = this;
// Try t login with token. If token is not available, try password. If no password, ask for it. // Try to login with token. If token is not available, try password. If no password, ask for it.
var promise = null; var promise = null;
var token = Tinode.getLoginToken(); var token = Tinode.getLoginToken();
if (password) { if (token) {
promise = Tinode.loginToken(token.token);
} else if (password) {
this.setState({password: null}); this.setState({password: null});
promise = Tinode.loginBasic(login, password); promise = Tinode.loginBasic(login, password);
} else if (token) {
promise = Tinode.loginToken(token.token);
} else { } else {
this.setState({loginDisabled: false}); this.setState({loginDisabled: false});
} }