Bug 1653517 - disable OS reauth for Tunderbird non-nightly builds. r=Paenglab

mail/app/profile/all-thunderbird.js

@@ -111,6 +111,12 @@ pref("app.feedback.baseURL", "https://input.mozilla.org/%LOCALE%/feedback/%APP%/
 // Show error messages in error console.
 pref("javascript.options.showInConsole", true);
 
+#ifdef NIGHTLY_BUILD
+pref("signon.management.page.os-auth.enabled", true);
+#else
+pref("signon.management.page.os-auth.enabled", false);
+#endif
+
 // Controls enabling of the extension system logging (can reduce performance)
 pref("extensions.logging.enabled", false);
 pref("extensions.overlayloader.loglevel", "warn");

mail/components/preferences/passwordManager.js

@@ -780,7 +780,10 @@ async function masterPasswordLogin(noPasswordCallback) {
   if (token.checkPassword("")) {
     // The OS re-authentication on Linux isn't working (Bug 1527745),
     // still add the confirm dialog for Linux.
-    if (AppConstants.platform !== "linux") {
+    if (
+      Services.prefs.getBoolPref("signon.management.page.os-auth.enabled") &&
+      AppConstants.platform !== "linux"
+    ) {
       // Require OS authentication before the user can show the passwords or copy them.
       let messageId = "password-os-auth-dialog-message";
       if (AppConstants.platform == "macosx") {

mail/components/preferences/privacy.js

@@ -368,6 +368,7 @@ var gPrivacyPane = {
     // OS reauthenticate functionality is not available on Linux yet (bug 1527745)
     if (
       !LoginHelper.isMasterPasswordSet() &&
+      Services.prefs.getBoolPref("signon.management.page.os-auth.enabled") &&
       AppConstants.platform != "linux"
     ) {
       let messageId =