2
0
Эх сурвалжийг харах

Only call `credentials_url` when `authentication` is set to `login`

Also update to newer strophe.js version which contains a bugfix.
JC Brand 6 жил өмнө
parent
commit
168f29cf06

+ 2 - 2
package-lock.json

@@ -13771,8 +13771,8 @@
       }
     },
     "strophe.js": {
-      "version": "github:strophe/strophejs#31f31b52fd37a92eebee7b47d668a7d7dc40df3b",
-      "from": "github:strophe/strophejs#31f31b52fd37a92eebee7b47d668a7d7dc40df3b"
+      "version": "github:strophe/strophejs#c572c9b1a5c95529784b363fcfe927b281c2f62e",
+      "from": "github:strophe/strophejs#c572c9b1a5c95529784b363fcfe927b281c2f62e"
     },
     "style-loader": {
       "version": "0.23.1",

+ 3 - 2
src/headless/converse-core.js

@@ -1223,7 +1223,7 @@ _converse.initialize = async function (settings, callback) {
         if (credentials) {
             this.autoLogin(credentials);
         } else if (this.auto_login) {
-            if (this.credentials_url) {
+            if (this.credentials_url && _converse.authentication === 'login') {
                 const data = await getLoginCredentials();
                 this.autoLogin(data);
             } else if (!this.jid) {
@@ -1235,7 +1235,8 @@ _converse.initialize = async function (settings, callback) {
                     "(via credentials_url)."
                 );
             } else {
-                this.autoLogin(); // Could be ANONYMOUS or EXTERNAL
+                // Could be ANONYMOUS or EXTERNAL or manual passing in of JID and password
+                this.autoLogin();
             }
         } else if (reconnecting) {
             this.autoLogin();

+ 1 - 1
src/headless/package.json

@@ -29,7 +29,7 @@
     "jed": "1.1.1",
     "lodash": "^4.17.11",
     "pluggable.js": "2.0.1",
-    "strophe.js": "strophe/strophejs#31f31b52fd37a92eebee7b47d668a7d7dc40df3b",
+    "strophe.js": "strophe/strophejs#c572c9b1a5c95529784b363fcfe927b281c2f62e",
     "twemoji": "^11.0.1",
     "urijs": "^1.19.1"
   }