Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Prioritise logging in with credentials_url...

Browse Source 
above logging in with passed in JID and password, since the password
might be an expired token.
This commit is contained in:
JC Brand 2019-07-26 20:03:27 +02:00
parent 778b4ff131
commit 179c0810c7
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/headless/converse-core.js
View File

@ -427,10 +427,12 @@ async function attemptNonPreboundSession (credentials) {
if (_converse.authentication === _converse.LOGIN) { if (_converse.authentication === _converse.LOGIN) {
if (credentials) { if (credentials) {
connect(credentials); connect(credentials);
} else if (_converse.credentials_url) {
// We give credentials_url preference, because
// _converse.connection.pass might be an expired token.
connect(await getLoginCredentials());
} else if (_converse.jid && (_converse.password || _converse.connection.pass)) { } else if (_converse.jid && (_converse.password || _converse.connection.pass)) {
connect(); connect();
} else if (_converse.credentials_url) {
connect(await getLoginCredentials());
} else if (!_converse.isTestEnv() && window.PasswordCredential) { } else if (!_converse.isTestEnv() && window.PasswordCredential) {
connect(await getLoginCredentialsFromBrowser()); connect(await getLoginCredentialsFromBrowser());
} else { } else {