Bug 1538409 - back out wrong authentication method selection change. r=me
authorMagnus Melin <mkmelin+mozilla@iki.fi>
Sun, 09 Feb 2020 21:45:09 +0200
changeset 37266 25e74f6bf106447c569c5fec01c50a2f223be1bd
parent 37265 bde1bbc31f16874cdb70906fbf1e916a72766d67
child 37267 352a5f7465f3274c51d6cd58952714585396aabc
push id2552
push userclokep@gmail.com
push dateMon, 10 Feb 2020 21:24:16 +0000
treeherdercomm-beta@f95a6f4408a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme
bugs1538409
Bug 1538409 - back out wrong authentication method selection change. r=me
mail/components/accountcreation/content/emailWizard.js
--- a/mail/components/accountcreation/content/emailWizard.js
+++ b/mail/components/accountcreation/content/emailWizard.js
@@ -1476,18 +1476,16 @@ EmailConfigWizard.prototype = {
           " is " +
           iDetails
       );
       config.oauthSettings = {};
       [config.oauthSettings.issuer, config.oauthSettings.scope] = iDetails;
       // oauthsettings are not stored nor changeable in the user interface, so just
       // store them in the base configuration.
       this._currentConfig.oauthSettings = config.oauthSettings;
-    } else {
-      e("incoming_authMethod").value = 0; // Set to autodetect.
     }
 
     // outgoing server
     e("outgoing_hostname").value = config.outgoing.hostname;
     e("outgoing_username").value = config.outgoing.username;
     // While sameInOutUsernames is true we synchronize values of incoming
     // and outgoing username.
     this.sameInOutUsernames = true;
@@ -1517,18 +1515,16 @@ EmailConfigWizard.prototype = {
           " is " +
           oDetails
       );
       config.oauthSettings = {};
       [config.oauthSettings.issuer, config.oauthSettings.scope] = oDetails;
       // oauthsettings are not stored nor changeable in the user interface, so just
       // store them in the base configuration.
       this._currentConfig.oauthSettings = config.oauthSettings;
-    } else {
-      e("outgoing_authMethod").value = 0; // Set to autodetect.
     }
 
     // populate fields even if existingServerKey, in case user changes back
     if (config.outgoing.existingServerKey) {
       let menulist = e("outgoing_hostname");
       // We can't use menulist.value = config.outgoing.existingServerKey
       // because would overwrite the text field, so have to do it manually:
       let menuitems = menulist.menupopup.children;