Revert of Revert of Inline sign in extracts gaia id from HTTP header and seeds account tracker

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

 // Copyright 2013 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/ui/webui/chromeos/login/gaia_screen_handler.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
@@ skipping 249 matching lines @@
   builder->Add("createAccount", IDS_CREATE_ACCOUNT_HTML);
   builder->Add("guestSignin", IDS_BROWSE_WITHOUT_SIGNING_IN_HTML);
   builder->Add("createSupervisedUser",
                IDS_CREATE_SUPERVISED_USER_HTML);
   builder->Add("createSupervisedUserFeatureName",
                IDS_CREATE_SUPERVISED_USER_FEATURE_NAME);
   builder->Add("consumerManagementEnrollmentSigninMessage",
                IDS_LOGIN_CONSUMER_MANAGEMENT_ENROLLMENT);
 
   // Strings used by the SAML fatal error dialog.
-  builder->Add("fatalErrorMessageNoEmail", IDS_LOGIN_FATAL_ERROR_NO_EMAIL);
+  builder->Add("fatalErrorMessageNoAccountDetails",
+               IDS_LOGIN_FATAL_ERROR_NO_ACCOUNT_DETAILS);
   builder->Add("fatalErrorMessageNoPassword",
                IDS_LOGIN_FATAL_ERROR_NO_PASSWORD);
   builder->Add("fatalErrorMessageVerificationFailed",
                IDS_LOGIN_FATAL_ERROR_PASSWORD_VERIFICATION);
   builder->Add("fatalErrorMessageInsecureURL",
                IDS_LOGIN_FATAL_ERROR_TEXT_INSECURE_URL);
   builder->Add("fatalErrorInstructions", IDS_LOGIN_FATAL_ERROR_INSTRUCTIONS);
   builder->Add("fatalErrorDismissButton", IDS_OK);
 }
 
@@ skipping 31 matching lines @@
 
   if (network_state_informer_->state() != NetworkStateInformer::ONLINE)
     return;
   if (frame_state_ == FRAME_STATE_LOADED)
     UpdateState(ErrorScreenActor::ERROR_REASON_UPDATE);
   else if (frame_state_ == FRAME_STATE_ERROR)
     UpdateState(ErrorScreenActor::ERROR_REASON_FRAME_ERROR);
 }
 
 void GaiaScreenHandler::HandleCompleteAuthentication(
+    const std::string& gaia_id,
     const std::string& email,
     const std::string& password,
     const std::string& auth_code) {
   if (!Delegate())
     return;
+
+  DCHECK(!email.empty());
+  DCHECK(!gaia_id.empty());
   Delegate()->SetDisplayEmail(gaia::SanitizeEmail(email));
   UserContext user_context(email);
+  user_context.SetGaiaID(gaia_id);
   user_context.SetKey(Key(password));
   user_context.SetAuthCode(auth_code);
   Delegate()->CompleteLogin(user_context);
 }
 
-void GaiaScreenHandler::HandleCompleteLogin(const std::string& typed_email,
+void GaiaScreenHandler::HandleCompleteLogin(const std::string& gaia_id,
+                                            const std::string& typed_email,
                                             const std::string& password,
                                             bool using_saml) {
   if (!is_enrolling_consumer_management_) {
-    DoCompleteLogin(typed_email, password, using_saml);
+    DoCompleteLogin(gaia_id, typed_email, password, using_saml);
     return;
   }
 
   // Consumer management enrollment is in progress.
   const std::string owner_email =
       user_manager::UserManager::Get()->GetOwnerEmail();
   if (typed_email != owner_email) {
     // Show Gaia sign-in screen again, since we only allow the owner to sign
     // in.
     populated_email_ = owner_email;
     ShowGaia(is_enrolling_consumer_management_);
     return;
   }
 
   CHECK(consumer_management_);
   consumer_management_->SetOwner(owner_email,
                                  base::Bind(&GaiaScreenHandler::OnSetOwnerDone,
                                             weak_factory_.GetWeakPtr(),
+                                            gaia_id,
                                             typed_email,
                                             password,
                                             using_saml));
 }
 
 void GaiaScreenHandler::HandleUsingSAMLAPI() {
   SetSAMLPrincipalsAPIUsed(true);
 }
 
 void GaiaScreenHandler::HandleScrapedPasswordCount(int password_count) {
@@ skipping 43 matching lines @@
     // focus to current pod (see crbug/175243).
     DCHECK(signin_screen_handler_);
     signin_screen_handler_->RefocusCurrentPod();
   }
   HandleFrameLoadingCompleted(0);
 
   if (test_expects_complete_login_)
     SubmitLoginFormForTest();
 }
 
-void GaiaScreenHandler::OnSetOwnerDone(const std::string& typed_email,
+void GaiaScreenHandler::OnSetOwnerDone(const std::string& gaia_id,
+                                       const std::string& typed_email,
                                        const std::string& password,
                                        bool using_saml,
                                        bool success) {
   CHECK(consumer_management_);
   if (success) {
     consumer_management_->SetEnrollmentStage(
         policy::ConsumerManagementService::ENROLLMENT_STAGE_OWNER_STORED);
   } else {
     LOG(ERROR) << "Failed to write owner e-mail to boot lockbox.";
     consumer_management_->SetEnrollmentStage(
         policy::ConsumerManagementService::
             ENROLLMENT_STAGE_BOOT_LOCKBOX_FAILED);
     // We should continue logging in the user, as there's not much we can do
     // here.
   }
-  DoCompleteLogin(typed_email, password, using_saml);
+  DoCompleteLogin(gaia_id, typed_email, password, using_saml);
 }
 
-void GaiaScreenHandler::DoCompleteLogin(const std::string& typed_email,
+void GaiaScreenHandler::DoCompleteLogin(const std::string& gaia_id,
+                                        const std::string& typed_email,
                                         const std::string& password,
                                         bool using_saml) {
   if (!Delegate())
     return;
 
   if (using_saml && !using_saml_api_)
     RecordSAMLScrapingVerificationResultInHistogram(true);
 
+  DCHECK(!typed_email.empty());
+  DCHECK(!gaia_id.empty());
   const std::string sanitized_email = gaia::SanitizeEmail(typed_email);
   Delegate()->SetDisplayEmail(sanitized_email);
   UserContext user_context(sanitized_email);
+  user_context.SetGaiaID(gaia_id);
   user_context.SetKey(Key(password));
   user_context.SetAuthFlow(using_saml
                                ? UserContext::AUTH_FLOW_GAIA_WITH_SAML
                                : UserContext::AUTH_FLOW_GAIA_WITHOUT_SAML);
   Delegate()->CompleteLogin(user_context);
 
   if (test_expects_complete_login_) {
     VLOG(2) << "Complete test login for " << typed_email
             << ", requested=" << test_user_;
 
@@ skipping 228 matching lines @@
 
 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {
   DCHECK(signin_screen_handler_);
   return signin_screen_handler_->delegate_;
 }
 
 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {
   signin_screen_handler_ = handler;
 }
 }  // namespace chromeos