Move writing information to the lockbox after registering with the DM server.

chrome/browser/chromeos/login/enterprise_enrollment_screen.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/enterprise_enrollment_screen.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
@@ skipping 82 matching lines @@
       }
     }
     LOG(ERROR) << "Enrollment will not finish because the InstallAttrs has "
                << "been locked already but does not contain valid data.";
   }
   return false;
 }
 
 void EnterpriseEnrollmentScreen::OnClientLoginSuccess(
     const ClientLoginResult& result) {
-  WriteInstallAttributesData(result);
+  auth_fetcher_->StartIssueAuthToken(
+          result.sid, result.lsid, GaiaConstants::kDeviceManagementService);
 }
 
 void EnterpriseEnrollmentScreen::OnClientLoginFailure(
     const GoogleServiceAuthError& error) {
   HandleAuthError(error);
 }
 
 void EnterpriseEnrollmentScreen::OnIssueAuthTokenSuccess(
     const std::string& service,
     const std::string& auth_token) {
   if (service != GaiaConstants::kDeviceManagementService) {
     NOTREACHED() << service;
     return;
   }
 
   scoped_ptr<GaiaAuthFetcher> auth_fetcher(auth_fetcher_.release());
 
   policy::BrowserPolicyConnector* connector =
       g_browser_process->browser_policy_connector();
   if (!connector->cloud_policy_subsystem()) {
     NOTREACHED() << "Cloud policy subsystem not initialized.";
     if (view())
       view()->ShowFatalEnrollmentError();
     return;
   }
 
   registrar_.reset(new policy::CloudPolicySubsystem::ObserverRegistrar(
       connector->cloud_policy_subsystem(), this));
-
+  LOG(ERROR) << "### Auth done!";

[Mattias Nissler (ping if slow), 2011/04/19 12:15:25]

Be sure to remove this or make it a VLOG() before committing.

+  connector->cloud_policy_subsystem()->StopAfterTokenFetch(true);
   // Push the credentials to the policy infrastructure. It'll start enrollment
   // and notify us of progress through CloudPolicySubsystem::Observer.
   connector->SetCredentials(user_, auth_token);
 }
 
 void EnterpriseEnrollmentScreen::OnIssueAuthTokenFailure(
     const std::string& service,
     const GoogleServiceAuthError& error) {
   if (service != GaiaConstants::kDeviceManagementService) {
     NOTREACHED() << service;
     return;
   }
 
   HandleAuthError(error);
 }
 
 void EnterpriseEnrollmentScreen::OnPolicyStateChanged(
     policy::CloudPolicySubsystem::PolicySubsystemState state,
     policy::CloudPolicySubsystem::ErrorDetails error_details) {
 
+  LOG(ERROR) << "### State change : " << state;

[Mattias Nissler (ping if slow), 2011/04/19 12:15:25]

same here.

   if (view()) {
     switch (state) {
       case policy::CloudPolicySubsystem::UNENROLLED:
         // Still working...
         return;
       case policy::CloudPolicySubsystem::BAD_GAIA_TOKEN:
       case policy::CloudPolicySubsystem::LOCAL_ERROR:
         view()->ShowFatalEnrollmentError();
         break;
       case policy::CloudPolicySubsystem::UNMANAGED:
         view()->ShowAccountError();
         break;
       case policy::CloudPolicySubsystem::NETWORK_ERROR:
         view()->ShowNetworkEnrollmentError();
         break;
+      case policy::CloudPolicySubsystem::TOKEN_FETCHED:
+        WriteInstallAttributesData();
+        return;
       case policy::CloudPolicySubsystem::SUCCESS:
         // Success!
         registrar_.reset();
         view()->ShowConfirmationScreen();
         return;
     }
 
     // We have an error.
     LOG(WARNING) << "Policy subsystem error during enrollment: " << state
                  << " details: " << error_details;
@@ skipping 34 matching lines @@
       // fall through.
     case GoogleServiceAuthError::REQUEST_CANCELED:
       LOG(ERROR) << "Unexpected GAIA auth error: " << error.state();
       view()->ShowFatalAuthError();
       return;
   }
 
   NOTREACHED() << error.state();
 }
 
-void EnterpriseEnrollmentScreen::WriteInstallAttributesData(
-    const ClientLoginResult& result) {
+void EnterpriseEnrollmentScreen::WriteInstallAttributesData() {
   // Since this method is also called directly.
   runnable_method_factory_.RevokeAll();
 
   if (!view())
     return;
 
+  LOG(ERROR) << "### Lock it!";

[Mattias Nissler (ping if slow), 2011/04/19 12:15:25]

And here!

+
   switch (g_browser_process->browser_policy_connector()->LockDevice(user_)) {
-    case policy::EnterpriseInstallAttributes::LOCK_SUCCESS:
-      // Proceed with register and policy fetch.
-      auth_fetcher_->StartIssueAuthToken(
-          result.sid, result.lsid, GaiaConstants::kDeviceManagementService);
+    case policy::EnterpriseInstallAttributes::LOCK_SUCCESS: {
+      // Proceed with policy fetch.
+      policy::BrowserPolicyConnector* connector =
+          g_browser_process->browser_policy_connector();
+      connector->cloud_policy_subsystem()->SendPolicyRequest();

[Mattias Nissler (ping if slow), 2011/04/19 12:15:25]

This should probably be connector->EnablePolicy(), which will then forward the
call to the identity strategy, so it can send the OnDeviceTokenChanged()
notification the controller.

+      LOG(ERROR) << "### Locked!";

[Mattias Nissler (ping if slow), 2011/04/19 12:15:25]

And here.

       return;
-    case policy::EnterpriseInstallAttributes::LOCK_NOT_READY:
+    }
+    case policy::EnterpriseInstallAttributes::LOCK_NOT_READY: {
       // InstallAttributes not ready yet, retry later.
       LOG(WARNING) << "Install Attributes not ready yet will retry in "
                    << kLockRetryIntervalMs << "ms.";
       MessageLoop::current()->PostDelayedTask(
           FROM_HERE,
           runnable_method_factory_.NewRunnableMethod(
-              &EnterpriseEnrollmentScreen::WriteInstallAttributesData, result),
+              &EnterpriseEnrollmentScreen::WriteInstallAttributesData),
           kLockRetryIntervalMs);
       return;
-    case policy::EnterpriseInstallAttributes::LOCK_BACKEND_ERROR:
+    }
+    case policy::EnterpriseInstallAttributes::LOCK_BACKEND_ERROR: {
       view()->ShowFatalEnrollmentError();
       return;
-    case policy::EnterpriseInstallAttributes::LOCK_WRONG_USER:
+    }
+    case policy::EnterpriseInstallAttributes::LOCK_WRONG_USER: {
       LOG(ERROR) << "Enrollment can not proceed because the InstallAttrs "
                  << "has been locked already!";
       view()->ShowFatalEnrollmentError();
       return;
+    }
   }
 
   NOTREACHED();
 }
 
 }  // namespace chromeos