# HG changeset patch
# User Magnus Melin <mkmelin+mozilla@iki.fi>
# Date 1587403708 -10800
# Node ID 62453d8cdbb795a82b49d3d1bd2c99b9fecf7c3a
# Parent  8c0b1408812a6fee0618a6ac9824dd3e3b67a8ba
Bug 1528136 - Backed out changeset a5a26b1ee9ec (bug 1592258) since O365 gained FMA support. r=aleca

diff --git a/mail/components/accountcreation/content/emailWizard.js.1528136.later b/mail/components/accountcreation/content/emailWizard.js.1528136.later
new file mode 100644
--- /dev/null
+++ b/mail/components/accountcreation/content/emailWizard.js.1528136.later
@@ -0,0 +1,113 @@
+--- emailWizard.js
++++ emailWizard.js
+@@ -790,109 +790,25 @@ EmailConfigWizard.prototype = {
+       return;
+     }
+ 
+     e("status-area").setAttribute("status", "loading");
+     config.addons = [];
+     let successCallback = () => {
+       this._abortable = null;
+       e("status-area").setAttribute("status", "result");
+-      // For Office365, do a pre-verification of whether IMAP works. If it fails
+-      // due to wrong password, make the user aware. If it fails due to other
+-      // reasons (mainly MFA enforced), make Exchange the default.
+-      // We do this since the account may have MFA enabled and that can't yet be
+-      // used with IMAP/POP.
+-      if (
+-        config.incoming.hostname == "outlook.office365.com" &&
+-        (config.incoming.type == "imap" || config.incoming.type == "pop3") &&
+-        config.incomingAlternatives.some(i => i.type == "exchange")
+-      ) {
+-        this.startSpinner("looking_up_settings_exchange");
+-        this._currentConfig = config;
+-        let configFilledIn = this.getConcreteConfig();
+-        this.checkOffice365Creds(
+-          configFilledIn,
+-          () => {
+-            // Password valid: check whether IMAP works.
+-            verifyConfig(
+-              configFilledIn,
+-              false,
+-              this._parentMsgWindow,
+-              testedConfig => {
+-                // IMAP worked
+-                this.stopSpinner("found_settings_exchange");
+-                this.displayConfigResult(testedConfig);
+-              },
+-              ex => {
+-                // IMAP failed: make Exchange the default.
+-                config.incomingAlternatives.unshift(config.incoming);
+-                config.incoming = config.incomingAlternatives.find(
+-                  alt => alt.type == "exchange"
+-                );
+-                config.incomingAlternatives = config.incomingAlternatives.filter(
+-                  alt => alt != config.incoming
+-                );
+-                this.stopSpinner("found_settings_exchange");
+-                this.displayConfigResult(config);
+-              }
+-            );
+-          },
+-          () => {
+-            // Invalid password: show the error and let user correct it.
+-            this.onStartOver();
+-            _show("status-area");
+-            this.showErrorStatus("user_pass_invalid");
+-          }
+-        );
+-      } else {
+-        this.displayConfigResult(config);
+-      }
++      this.displayConfigResult(config);
+     };
+     this._abortable = getAddonsList(config, successCallback, e => {
+       successCallback();
+       this.showErrorMsg(e);
+     });
+   },
+ 
+   /**
+-   * Office365 AutoDiscover gives us specific error codes for
+-   * invalid password and MFA enforced, so we can differentiate that.
+-   * @param {Function} successCallback - function to be called in case the
+-   *   credentials were not explicitedly invalid.
+-   * @param {Function} invalidPassword - function to be called in case the
+-   *   credentials were explicitely invalid.
+-   */
+-  checkOffice365Creds(configFilledIn, successCallback, invalidPassword) {
+-    let fetch = new FetchHTTP(
+-      "https://autodiscover-s.outlook.com/Autodiscover/Autodiscover.xml",
+-      {
+-        username: configFilledIn.incoming.username,
+-        password: configFilledIn.incoming.password,
+-        allowAuthPrompt: false,
+-        allowCache: false,
+-        headers: {
+-          Cookie: "",
+-        },
+-        timeout: 10000,
+-      },
+-      successCallback,
+-      ex => {
+-        let err = fetch._request.getResponseHeader("X-AutoDiscovery-Error");
+-        gEmailWizardLogger.info("O365 X-AutoDiscovery-Error: " + err);
+-        if (err && err.includes(":InvalidCreds:")) {
+-          invalidPassword();
+-        } else {
+-          successCallback();
+-        }
+-      }
+-    );
+-    fetch.start();
+-  },
+-
+-  /**
+    * [Stop] button click handler.
+    * This allows the user to abort any longer operation, esp. network activity.
+    * We currently have 3 such cases here:
+    * 1. findConfig(), i.e. fetch config from DB, guessConfig etc.
+    * 2. onHalfManualTest(), i.e. the [Retest] button in manual config.
+    * 3. verifyConfig() - We can't stop this yet, so irrelevant here currently.
+    * Given that these need slightly different actions, this function will be set
+    * to a function (i.e. overwritten) by whoever enables the stop button.