Merge pull request #21087 from 6a68/bug-1030597-blank-fmd-settings-panel

Bug 1030597 - Always show some find my device panel by default. r=arthur...

apps/settings/js/findmydevice.js

@@ -27,6 +27,7 @@ var FindMyDevice = {
         },
         onerror: function fmd_fxa_onerror(err) {
           loginButton.addEventListener('click', self._onLoginClick.bind(self));
+          self._togglePanel(false);
           console.error(err);
         }
       });
@@ -70,14 +71,18 @@ var FindMyDevice = {
       value ? 'findmydevice-active-tracking' : 'findmydevice-not-tracking');
   },
 
-  _onChangeLoginState: function fmd_on_change_login_state(loggedIn) {
-    console.log('settings, logged in: ' + loggedIn);
-
+  _togglePanel: function fmd_toggle_panel(loggedIn) {
     var signin = document.getElementById('findmydevice-signin');
     signin.hidden = loggedIn;
 
     var settings = document.getElementById('findmydevice-settings');
     settings.hidden = !loggedIn;
+  },
+
+  _onChangeLoginState: function fmd_on_change_login_state(loggedIn) {
+    console.log('settings, logged in: ' + loggedIn);
+
+    this._togglePanel(loggedIn);
 
     if (this._interactiveLogin) {
       SettingsListener.getSettingsLock().set({

apps/settings/test/unit/findmydevice_panel_test.js

@@ -41,11 +41,13 @@ suite('Find My Device panel > ', function() {
       onlogin: null,
       onlogout: null,
       onready: null,
+      onerror: null,
 
       watch: function(options) {
         this.onlogin = options.onlogin;
         this.onlogout = options.onlogout;
         this.onready = options.onready;
+        this.onerror = options.onerror;
 
         setTimeout(function() {
           options.onready();
@@ -96,6 +98,14 @@ suite('Find My Device panel > ', function() {
     assert.isTrue(settingsSection.hidden);
   });
 
+  test('bug 1030597 - prompt for login if onerror fires', function() {
+    signinSection.hidden = true;
+    settingsSection.hidden = true;
+    MockMozId.onerror();
+    assert.isTrue(settingsSection.hidden);
+    assert.isFalse(signinSection.hidden);
+  });
+
   test('show settings when logged in to FxA', function() {
     MockMozId.onlogin();
     assert.isFalse(settingsSection.hidden);