Browse Source

Returning nick with credentials_url complicates things too much

JC Brand 6 years ago
parent
commit
e189acc8c9

+ 0 - 1
CHANGES.md

@@ -7,7 +7,6 @@
 - Take roster nickname into consideration when rendering messages and chat headings.
 - Hide the textarea when a user is muted in a groupchat.
 - Don't restore a BOSH session without knowing the JID
-- You can now return a `nickname` value with your [credentials_url](https://conversejs.org/docs/html/configuration.html#credentials-url) endpoint.
 - #1296: `embedded` view mode shows `chatbox-navback` arrow in header
 - #1532: Converse reloads on enter pressed in the filter box
 

+ 1 - 6
dist/converse.js

@@ -63761,8 +63761,7 @@ function fetchLoginCredentials() {
         const data = JSON.parse(xhr.responseText);
         resolve({
           'jid': data.jid,
-          'password': data.password,
-          'nickname': data.nickname
+          'password': data.password
         });
       } else {
         xhr.onerror({});
@@ -64616,10 +64615,6 @@ _converse.initialize = async function (settings, callback) {
 
           _converse.log(e, strophe_js__WEBPACK_IMPORTED_MODULE_0__["Strophe"].LogLevel.ERROR);
         } finally {
-          if (_lodash_noconflict__WEBPACK_IMPORTED_MODULE_4___default.a.get(data, 'nickname')) {
-            _converse.nickname = data.nickname;
-          }
-
           this.autoLogin(data);
         }
       } else if (!this.jid) {

+ 0 - 6
docs/source/configuration.rst

@@ -572,14 +572,8 @@ The server behind ``credentials_url`` should return a JSON encoded object::
     {
         "jid": "me@example.com/resource",
         "password": "Ilikecats!"
-        "nickname": "catlover"
     }
 
-The ``nickname`` value is optional. If it's returned, then it's treated
-as equivalent to passing :ref:`nickname` to ``converse.initialize`` and will
-override any ``nickname`` value that might have already been passed in to
-``converse.initialize``.
-
 
 csi_waiting_time
 ----------------

+ 1 - 5
src/headless/converse-core.js

@@ -493,8 +493,7 @@ function fetchLoginCredentials () {
              const data = JSON.parse(xhr.responseText);
              resolve({
                 'jid': data.jid,
-                'password': data.password,
-                'nickname': data.nickname
+                'password': data.password
              });
           } else {
              xhr.onerror({});
@@ -1252,9 +1251,6 @@ _converse.initialize = async function (settings, callback) {
                    _converse.log("Could not fetch login credentials", Strophe.LogLevel.ERROR);
                    _converse.log(e, Strophe.LogLevel.ERROR);
                 } finally {
-                   if (_.get(data, 'nickname')) {
-                      _converse.nickname = data.nickname;
-                   }
                    this.autoLogin(data);
                 }
             } else if (!this.jid) {

+ 1 - 6
src/headless/dist/converse-headless.js

@@ -42155,8 +42155,7 @@ function fetchLoginCredentials() {
         const data = JSON.parse(xhr.responseText);
         resolve({
           'jid': data.jid,
-          'password': data.password,
-          'nickname': data.nickname
+          'password': data.password
         });
       } else {
         xhr.onerror({});
@@ -43010,10 +43009,6 @@ _converse.initialize = async function (settings, callback) {
 
           _converse.log(e, strophe_js__WEBPACK_IMPORTED_MODULE_0__["Strophe"].LogLevel.ERROR);
         } finally {
-          if (_lodash_noconflict__WEBPACK_IMPORTED_MODULE_4___default.a.get(data, 'nickname')) {
-            _converse.nickname = data.nickname;
-          }
-
           this.autoLogin(data);
         }
       } else if (!this.jid) {