cros: Show Powerwash button in case of a fatal demo setup error

Bug: 871412
Change-Id: I5bf054ed6ef4c927253fbad4fe09ec674cc58d39
Reviewed-on: https://chromium-review.googlesource.com/c/1310559Reviewed-by: Aga Wronska <agawronska@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Commit-Queue: Wenzhao (Colin) Zang <wzang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605256}

chrome/browser/chromeos/login/demo_mode/demo_setup_controller_unittest.cc

@@ -229,12 +229,38 @@ TEST_F(DemoSetupControllerTest, OfflineInvalidDeviceLocalAccountPolicyBlob) {
   EXPECT_EQ("", GetDeviceRequisition());
 }
 
-TEST_F(DemoSetupControllerTest, OfflineError) {
+TEST_F(DemoSetupControllerTest, OfflineErrorDefault) {
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(SetupDummyOfflinePolicyDir("test", &temp_dir));
 
   EnterpriseEnrollmentHelper::SetupEnrollmentHelperMock(
-      &MockDemoModeOfflineEnrollmentHelperCreator<DemoModeSetupResult::ERROR>);
+      &MockDemoModeOfflineEnrollmentHelperCreator<
+          DemoModeSetupResult::ERROR_DEFAULT>);
+
+  policy::MockCloudPolicyStore mock_store;
+  EXPECT_CALL(mock_store, Store(_)).Times(0);
+  tested_controller_->SetDeviceLocalAccountPolicyStoreForTest(&mock_store);
+
+  tested_controller_->set_demo_config(DemoSession::DemoModeConfig::kOffline);
+  tested_controller_->SetOfflineDataDirForTest(temp_dir.GetPath());
+  tested_controller_->Enroll(
+      base::BindOnce(&DemoSetupControllerTestHelper::OnSetupSuccess,
+                     base::Unretained(helper_.get())),
+      base::BindOnce(&DemoSetupControllerTestHelper::OnSetupError,
+                     base::Unretained(helper_.get())));
+
+  EXPECT_TRUE(helper_->WaitResult(false));
+  EXPECT_FALSE(helper_->RequiresPowerwash());
+  EXPECT_EQ("", GetDeviceRequisition());
+}
+
+TEST_F(DemoSetupControllerTest, OfflineErrorPowerwashRequired) {
+  base::ScopedTempDir temp_dir;
+  ASSERT_TRUE(SetupDummyOfflinePolicyDir("test", &temp_dir));
+
+  EnterpriseEnrollmentHelper::SetupEnrollmentHelperMock(
+      &MockDemoModeOfflineEnrollmentHelperCreator<
+          DemoModeSetupResult::ERROR_POWERWASH_REQUIRED>);
 
   policy::MockCloudPolicyStore mock_store;
   EXPECT_CALL(mock_store, Store(_)).Times(0);
@@ -268,9 +294,10 @@ TEST_F(DemoSetupControllerTest, OnlineSuccess) {
   EXPECT_EQ("", GetDeviceRequisition());
 }
 
-TEST_F(DemoSetupControllerTest, OnlineError) {
+TEST_F(DemoSetupControllerTest, OnlineErrorDefault) {
   EnterpriseEnrollmentHelper::SetupEnrollmentHelperMock(
-      &MockDemoModeOnlineEnrollmentHelperCreator<DemoModeSetupResult::ERROR>);
+      &MockDemoModeOnlineEnrollmentHelperCreator<
+          DemoModeSetupResult::ERROR_DEFAULT>);
 
   tested_controller_->set_demo_config(DemoSession::DemoModeConfig::kOnline);
   tested_controller_->Enroll(
@@ -284,6 +311,23 @@ TEST_F(DemoSetupControllerTest, OnlineError) {
   EXPECT_EQ("", GetDeviceRequisition());
 }
 
+TEST_F(DemoSetupControllerTest, OnlineErrorPowerwashRequired) {
+  EnterpriseEnrollmentHelper::SetupEnrollmentHelperMock(
+      &MockDemoModeOnlineEnrollmentHelperCreator<
+          DemoModeSetupResult::ERROR_POWERWASH_REQUIRED>);
+
+  tested_controller_->set_demo_config(DemoSession::DemoModeConfig::kOnline);
+  tested_controller_->Enroll(
+      base::BindOnce(&DemoSetupControllerTestHelper::OnSetupSuccess,
+                     base::Unretained(helper_.get())),
+      base::BindOnce(&DemoSetupControllerTestHelper::OnSetupError,
+                     base::Unretained(helper_.get())));
+
+  EXPECT_TRUE(helper_->WaitResult(false));
+  EXPECT_TRUE(helper_->RequiresPowerwash());
+  EXPECT_EQ("", GetDeviceRequisition());
+}
+
 TEST_F(DemoSetupControllerTest, OnlineComponentError) {
   EnterpriseEnrollmentHelper::SetupEnrollmentHelperMock(
       &MockDemoModeOnlineEnrollmentHelperCreator<DemoModeSetupResult::SUCCESS>);
@@ -305,7 +349,8 @@ TEST_F(DemoSetupControllerTest, OnlineComponentError) {
 
 TEST_F(DemoSetupControllerTest, EnrollTwice) {
   EnterpriseEnrollmentHelper::SetupEnrollmentHelperMock(
-      &MockDemoModeOnlineEnrollmentHelperCreator<DemoModeSetupResult::ERROR>);
+      &MockDemoModeOnlineEnrollmentHelperCreator<
+          DemoModeSetupResult::ERROR_DEFAULT>);
 
   tested_controller_->set_demo_config(DemoSession::DemoModeConfig::kOnline);
   tested_controller_->Enroll(

chrome/browser/chromeos/login/demo_mode/demo_setup_test_utils.h

@@ -22,7 +22,12 @@ namespace chromeos {
 namespace test {
 
 // Result of Demo Mode setup.
-enum class DemoModeSetupResult { SUCCESS, ERROR };
+// TODO(agawronska, wzang): Test more error types.
+enum class DemoModeSetupResult {
+  SUCCESS,
+  ERROR_DEFAULT,
+  ERROR_POWERWASH_REQUIRED
+};
 
 // Helper method that mocks EnterpriseEnrollmentHelper for online Demo Mode
 // setup. It simulates specified Demo Mode enrollment |result|.
@@ -37,14 +42,23 @@ EnterpriseEnrollmentHelper* MockDemoModeOnlineEnrollmentHelperCreator(
   EXPECT_EQ(enrollment_config.mode, policy::EnrollmentConfig::MODE_ATTESTATION);
   EXPECT_CALL(*mock, EnrollUsingAttestation())
       .WillRepeatedly(testing::Invoke([mock]() {
-        if (result == DemoModeSetupResult::SUCCESS) {
+        switch (result) {
+          case DemoModeSetupResult::SUCCESS:
             mock->status_consumer()->OnDeviceEnrolled("");
-        } else {
-          // TODO(agawronska): Test different error types.
+            break;
+          case DemoModeSetupResult::ERROR_POWERWASH_REQUIRED:
+            mock->status_consumer()->OnEnrollmentError(
+                policy::EnrollmentStatus::ForLockError(
+                    chromeos::InstallAttributes::LOCK_ALREADY_LOCKED));
+            break;
+          case DemoModeSetupResult::ERROR_DEFAULT:
             mock->status_consumer()->OnEnrollmentError(
                 policy::EnrollmentStatus::ForRegistrationError(
                     policy::DeviceManagementStatus::
                         DM_STATUS_TEMPORARY_UNAVAILABLE));
+            break;
+          default:
+            NOTREACHED();
         }
       }));
   return mock;
@@ -64,13 +78,22 @@ EnterpriseEnrollmentHelper* MockDemoModeOfflineEnrollmentHelperCreator(
             policy::EnrollmentConfig::MODE_OFFLINE_DEMO);
   EXPECT_CALL(*mock, EnrollForOfflineDemo())
       .WillRepeatedly(testing::Invoke([mock]() {
-        if (result == DemoModeSetupResult::SUCCESS) {
+        switch (result) {
+          case DemoModeSetupResult::SUCCESS:
             mock->status_consumer()->OnDeviceEnrolled("");
-        } else {
-          // TODO(agawronska): Test different error types.
+            break;
+          case DemoModeSetupResult::ERROR_POWERWASH_REQUIRED:
             mock->status_consumer()->OnEnrollmentError(
                 policy::EnrollmentStatus::ForLockError(
                     chromeos::InstallAttributes::LOCK_READBACK_ERROR));
+            break;
+          case DemoModeSetupResult::ERROR_DEFAULT:
+            mock->status_consumer()->OnEnrollmentError(
+                policy::EnrollmentStatus::ForStatus(
+                    policy::EnrollmentStatus::OFFLINE_POLICY_DECODING_FAILED));
+            break;
+          default:
+            NOTREACHED();
         }
       }));
   return mock;

chrome/browser/chromeos/login/screens/demo_setup_screen.cc

@@ -8,11 +8,14 @@
 #include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
 #include "chrome/browser/chromeos/login/screens/demo_setup_screen_view.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/session_manager_client.h"
 
 namespace {
 
 constexpr char kUserActionStartSetup[] = "start-setup";
 constexpr char kUserActionClose[] = "close-setup";
+constexpr char kUserActionPowerwash[] = "powerwash";
 
 }  // namespace
 
@@ -47,6 +50,10 @@ void DemoSetupScreen::OnUserAction(const std::string& action_id) {
     StartEnrollment();
   } else if (action_id == kUserActionClose) {
     Finish(ScreenExitCode::DEMO_MODE_SETUP_CANCELED);
+  } else if (action_id == kUserActionPowerwash) {
+    chromeos::DBusThreadManager::Get()
+        ->GetSessionManagerClient()
+        ->StartDeviceWipe();
   } else {
     BaseScreen::OnUserAction(action_id);
   }

chrome/browser/resources/chromeos/login/demo_setup.html

@@ -51,12 +51,20 @@
             images/alert-illustration_2x.svg 2x">
       </div>
       <div slot="bottom-buttons" class="layout horizontal justified">
-        <oobe-back-button inverse on-tap="onCloseClicked_"></oobe-back-button>
-        <oobe-text-button inverse on-tap="onRetryClicked_">
+        <oobe-back-button inverse on-tap="onCloseClicked_"
+            disabled="[[isPowerwashRequired_]]"></oobe-back-button>
+        <oobe-text-button id="retryButton" on-tap="onRetryClicked_"
+            inverse hidden="[[isPowerwashRequired_]]">
           <div>
             [[i18nDynamic(locale, 'demoSetupErrorScreenRetryButtonLabel')]]
           </div>
         </oobe-text-button>
+        <oobe-text-button id="powerwashButton" on-tap="onPowerwashClicked_"
+            inverse hidden="[[!isPowerwashRequired_]]">
+          <div>
+            [[i18nDynamic(locale, 'demoSetupErrorScreenPowerwashButtonLabel')]]
+          </div>
+        </oobe-text-button>
       </div>
     </oobe-dialog>
 

chrome/browser/resources/chromeos/login/demo_setup.js

@@ -19,6 +19,12 @@ Polymer({
       value: '',
     },
 
+    /** Whether powerwash is required in case of a setup error. */
+    isPowerwashRequired_: {
+      type: Boolean,
+      value: false,
+    },
+
     /** Ordered array of screen ids that are a part of demo setup flow. */
     screens_: {
       type: Array,
@@ -48,9 +54,12 @@ Polymer({
   /**
    * Called when demo mode setup failed.
    * @param {string} message Error message to be displayed to the user.
+   * @param {boolean} isPowerwashRequired Whether powerwash is required to
+   *     recover from the error.
    */
-  onSetupFailed: function(message) {
+  onSetupFailed: function(message, isPowerwashRequired) {
     this.errorMessage_ = message;
+    this.isPowerwashRequired_ = isPowerwashRequired;
     this.showScreen_('demoSetupErrorDialog');
   },
 
@@ -96,11 +105,22 @@ Polymer({
     this.reset();
   },
 
+  /**
+   * Powerwash button click handler.
+   * @private
+   */
+  onPowerwashClicked_: function() {
+    chrome.send('login.DemoSetupScreen.userActed', ['powerwash']);
+  },
+
   /**
    * Close button click handler.
    * @private
    */
   onCloseClicked_: function() {
+    // TODO(wzang): Remove this after crbug.com/900640 is fixed.
+    if (this.isPowerwashRequired_)
+      return;
     chrome.send('login.DemoSetupScreen.userActed', ['close-setup']);
   },
 });

chrome/browser/resources/chromeos/login/oobe_buttons.html

@@ -46,6 +46,7 @@
 
   Attributes:
     'disabled' - button is disabled when the attribute is set.
+    (See crbug.com/900640)
     'inverse' - makes text white and background blue.
     'label-for-aria' - accessibility label.
     'border' - adds border to the button.
@@ -84,6 +85,7 @@
 
   Attributes:
     'disabled' - button is disabled when the attribute is set.
+    (See crbug.com/900640)
     'label-for-aria' - accessibility label.
 -->
 <dom-module id="oobe-back-button">

chrome/browser/resources/chromeos/login/oobe_screen_demo_setup.js

@@ -45,9 +45,11 @@ login.createScreen('DemoSetupScreen', 'demo-setup', function() {
     /**
      * Called when demo mode setup failed.
      * @param {string} message Error message to be displayed to the user.
+     * @param {boolean} isPowerwashRequired Whether powerwash is required to
+     *     recover from the error.
      */
-    onSetupFailed: function(message) {
-      this.demoSetupModule_.onSetupFailed(message);
+    onSetupFailed: function(message, isPowerwashRequired) {
+      this.demoSetupModule_.onSetupFailed(message, isPowerwashRequired);
     },
   };
 });

chrome/browser/ui/webui/chromeos/login/demo_setup_screen_handler.cc

@@ -43,10 +43,13 @@ void DemoSetupScreenHandler::Bind(DemoSetupScreen* screen) {
 
 void DemoSetupScreenHandler::OnSetupFailed(
     const DemoSetupController::DemoSetupError& error) {
+  // TODO(wzang): Consider customization for RecoveryMethod::kReboot as well.
   CallJS("onSetupFailed",
          base::JoinString({error.GetLocalizedErrorMessage(),
                            error.GetLocalizedRecoveryMessage()},
-                          base::UTF8ToUTF16(" ")));
+                          base::UTF8ToUTF16(" ")),
+         error.recovery_method() ==
+             DemoSetupController::DemoSetupError::RecoveryMethod::kPowerwash);
 }
 
 void DemoSetupScreenHandler::OnSetupSucceeded() {
@@ -63,6 +66,8 @@ void DemoSetupScreenHandler::DeclareLocalizedValues(
                IDS_OOBE_DEMO_SETUP_ERROR_SCREEN_TITLE);
   builder->Add("demoSetupErrorScreenRetryButtonLabel",
                IDS_OOBE_DEMO_SETUP_ERROR_SCREEN_RETRY_BUTTON_LABEL);
+  builder->Add("demoSetupErrorScreenPowerwashButtonLabel",
+               IDS_LOCAL_STATE_ERROR_POWERWASH_BUTTON);
 }
 
 }  // namespace chromeos