Allow sync with 2-factor StrongAuth accounts in ChromeOS.

chrome/browser/chromeos/login/existing_user_controller.cc

 // Copyright (c) 2010 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/existing_user_controller.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 
@@ skipping 12 matching lines @@
 #include "chrome/browser/chromeos/login/background_view.h"
 #include "chrome/browser/chromeos/login/help_app_launcher.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/login_utils.h"
 #include "chrome/browser/chromeos/login/message_bubble.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/user_cros_settings_provider.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/chromeos/wm_ipc.h"
+#include "chrome/browser/profile_manager.h"
 #include "chrome/browser/views/window.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "gfx/native_widget_types.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/screen.h"
 #include "views/widget/widget_gtk.h"
 #include "views/window/window.h"
 
 namespace chromeos {
 
 namespace {
 
 // Max number of users we'll show. The true max is the min of this and the
 // number of windows that fit on the screen.
 const size_t kMaxUsers = 5;
 
 // Used to indicate no user has been selected.
 const size_t kNotSelected = -1;
 
 // Offset of cursor in first position from edit left side. It's used to position
 // info bubble arrow to cursor.
 const int kCursorOffset = 5;
 
+// Url for setting up sync authentication.
+const char kSettingsSyncLoginUrl[] = "chrome://settings/personal";
+
 // Used to handle the asynchronous response of deleting a cryptohome directory.
 class RemoveAttempt : public CryptohomeLibrary::Delegate {
  public:
   explicit RemoveAttempt(const std::string& user_email)
       : user_email_(user_email) {
     if (CrosLibrary::Get()->EnsureLoaded()) {
       CrosLibrary::Get()->GetCryptohomeLibrary()->AsyncRemove(
           user_email_, this);
     }
   }
@@ skipping 410 matching lines @@
     const GaiaAuthConsumer::ClientLoginResult& credentials,
     bool pending_requests) {
   // LoginPerformer instance will delete itself once online auth result is OK.
   // In case of failure it'll bring up ScreenLock and ask for
   // correct password/display error message.
   // Even in case when following online,offline protocol and returning
   // requests_pending = false, let LoginPerformer delete itself.
   login_performer_->set_delegate(NULL);
   LoginPerformer* performer = login_performer_.release();
   performer = NULL;
+  bool known_user = UserManager::Get()->IsKnownUser(username);
+  if (credentials.two_factor && !known_user && !start_url_.is_valid()) {
+    // If we have a two factor error and and this is a new user and we are not
+    // already directing the user to a start url (e.g. a help page),
+    // direct them to the personal settings page.
+    // TODO(stevenjb): direct the user to a lightweight sync login page.
+    start_url_ = GURL(kSettingsSyncLoginUrl);
+  }
   AppendStartUrlToCmdline();
-  if (selected_view_index_ + 1 == controllers_.size() &&
-      !UserManager::Get()->IsKnownUser(username)) {
+  if (selected_view_index_ + 1 == controllers_.size() && !known_user) {
     // For new user login don't launch browser until we pass image screen.
     LoginUtils::Get()->EnableBrowserLaunch(false);
     LoginUtils::Get()->CompleteLogin(username, password, credentials);
     ActivateWizard(WizardController::IsDeviceRegistered() ?
         WizardController::kUserImageScreenName :
         WizardController::kRegistrationScreenName);
   } else {
     // Hide the login windows now.
     WmIpc::Message message(WM_IPC_MESSAGE_WM_HIDE_LOGIN);
     WmIpc::instance()->SendMessage(message);
@@ skipping 68 matching lines @@
 void ExistingUserController::RecoverEncryptedData(
     const std::string& old_password) {
   login_performer_->RecoverEncryptedData(old_password);
 }
 
 void ExistingUserController::ResyncEncryptedData() {
   login_performer_->ResyncEncryptedData();
 }
 
 }  // namespace chromeos