Start moving signin code out of browser/sync.

chrome/browser/sync/sync_setup_flow.cc

 // Copyright (c) 2012 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/sync/sync_setup_flow.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
-#include "chrome/browser/net/gaia/gaia_oauth_fetcher.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chrome/browser/sync/sync_setup_flow_handler.h"
 #include "chrome/browser/sync/syncable/model_type.h"
 #include "chrome/browser/sync/user_selectable_sync_type.h"
 #include "chrome/browser/sync/util/oauth.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "chrome/common/net/gaia/google_service_auth_error.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "grit/generated_resources.h"
 
 namespace {
 
 // Helper function to disable password sync.
 void DisablePasswordSync(ProfileSyncService* service) {
   syncable::ModelTypeSet types = service->GetPreferredDataTypes();
   types.Remove(syncable::PASSWORDS);
   service->OnUserChoseDatatypes(false, types);
 }
 
-// Returns the next step for the non-fatal error case.
-SyncSetupWizard::State GetStepForNonFatalError(ProfileSyncService* service) {
-  // TODO(sync): Update this error handling to allow different platforms to
-  // display the error appropriately (http://crbug.com/92722) instead of
-  // navigating to a LOGIN state that is not supported on every platform.
-  if (service->IsPassphraseRequired()) {
-#if defined(OS_CHROMEOS)
-    // On ChromeOS, we never want to request login information; this state
-    // always represents an invalid secondary passphrase.
-    // TODO(sync): correctly handle auth errors on ChromeOS: crosbug.com/24647.
-    return SyncSetupWizard::ENTER_PASSPHRASE;
-#else
-    if (service->IsUsingSecondaryPassphrase())
-      return SyncSetupWizard::ENTER_PASSPHRASE;
-    return SyncSetupWizard::GetLoginState();
-#endif
-  }
-
-  const GoogleServiceAuthError& error = service->GetAuthError();
-  if (error.state() == GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS ||
-      error.state() == GoogleServiceAuthError::CAPTCHA_REQUIRED ||
-      error.state() == GoogleServiceAuthError::ACCOUNT_DELETED ||
-      error.state() == GoogleServiceAuthError::ACCOUNT_DISABLED ||
-      error.state() == GoogleServiceAuthError::SERVICE_UNAVAILABLE) {
-    return SyncSetupWizard::GetLoginState();
-  }
-
-  NOTREACHED();
-  return SyncSetupWizard::FATAL_ERROR;
-}
-
 bool HasConfigurationChanged(const SyncConfiguration& configuration,
                              Profile* profile) {
   CHECK(profile);
 
   // This function must be updated every time a new sync datatype is added to
   // the sync preferences page.
   COMPILE_ASSERT(17 == syncable::MODEL_TYPE_COUNT,
                  UpdateCustomConfigHistogram);
 
   // If service is null or if this is a first time configuration, return true.
@@ skipping 136 matching lines @@
 
 SyncSetupFlow::~SyncSetupFlow() {
   flow_handler_->SetFlow(NULL);
 }
 
 // static
 SyncSetupFlow* SyncSetupFlow::Run(ProfileSyncService* service,
                                   SyncSetupFlowContainer* container,
                                   SyncSetupWizard::State start,
                                   SyncSetupWizard::State end) {
-  if (start == SyncSetupWizard::NONFATAL_ERROR)
-    start = GetStepForNonFatalError(service);
   if ((start == SyncSetupWizard::CONFIGURE ||
        start == SyncSetupWizard::SYNC_EVERYTHING ||
        start == SyncSetupWizard::ENTER_PASSPHRASE) &&
       !service->sync_initialized()) {
     // We are trying to open configuration window, but the backend isn't ready.
     // We just return NULL. This has the effect of the flow getting reset, and
     // the user's action has no effect.
     LOG(ERROR) << "Attempted to show sync configure before backend ready.";
     return NULL;
   }
   return new SyncSetupFlow(start, end, container, service);
 }
 
-void SyncSetupFlow::GetArgsForGaiaLogin(DictionaryValue* args) {
-  const GoogleServiceAuthError& error = service_->GetAuthError();
-  if (!last_attempted_user_email_.empty()) {
-    args->SetString("user", last_attempted_user_email_);
-    args->SetInteger("error", error.state());
-    args->SetBoolean("editable_user", true);
-  } else {
-    string16 user;
-    user = UTF8ToUTF16(service_->profile()->GetPrefs()->GetString(
-        prefs::kGoogleServicesUsername));
-    args->SetString("user", user);
-    args->SetInteger("error", 0);
-    args->SetBoolean("editable_user", user.empty());
-  }
-
-  args->SetString("captchaUrl", error.captcha().image_url.spec());
-}
-
 void SyncSetupFlow::GetArgsForConfigure(DictionaryValue* args) {
   // The SYNC_EVERYTHING case will set this to true.
   args->SetBoolean("showSyncEverythingPage", false);
 
   args->SetBoolean("syncAllDataTypes",
       service_->profile()->GetPrefs()->GetBoolean(
           prefs::kSyncKeepEverythingSynced));
 
   // Bookmarks, Preferences, and Themes are launched for good, there's no
   // going back now.  Check if the other data types are registered though.
@@ skipping 85 matching lines @@
 
 void SyncSetupFlow::Focus() {
   // This gets called from SyncSetupWizard::Focus(), and might get called
   // before flow_handler_ is set in AttachSyncSetupHandler() (which gets
   // called asynchronously after the UI initializes).
   if (flow_handler_)
     flow_handler_->Focus();
 }
 
 // A callback to notify the delegate that the dialog closed.
-// TODO(rickcam): Bug 90713: Handle OAUTH_LOGIN case here
 void SyncSetupFlow::OnDialogClosed(const std::string& json_retval) {
   DCHECK(json_retval.empty());
   container_->set_flow(NULL);  // Sever ties from the wizard.
   // If we've reached the end, mark it.  This could be a discrete run, in which
   // case it's already set, but it simplifes the logic to do it this way.
   if (current_state_ == end_state_)
     service_->SetSyncSetupCompleted();
 
   // Record the state at which the user cancelled the signon dialog.
   switch (current_state_) {
-    case SyncSetupWizard::GAIA_LOGIN:
-      ProfileSyncService::SyncEvent(
-          ProfileSyncService::CANCEL_FROM_SIGNON_WITHOUT_AUTH);
-      break;
-    case SyncSetupWizard::GAIA_SUCCESS:
-      ProfileSyncService::SyncEvent(
-          ProfileSyncService::CANCEL_DURING_SIGNON);
-      break;
     case SyncSetupWizard::CONFIGURE:
     case SyncSetupWizard::ENTER_PASSPHRASE:
     case SyncSetupWizard::SETTING_UP:
       // TODO(atwilson): Treat a close during ENTER_PASSPHRASE like a
       // Cancel + Skip (i.e. call OnPassphraseCancel()). http://crbug.com/74645
       ProfileSyncService::SyncEvent(
           ProfileSyncService::CANCEL_DURING_CONFIGURE);
       break;
-    case SyncSetupWizard::DONE:
-      // TODO(sync): rename this histogram; it's tracking authorization AND
-      // initial sync download time.
-      UMA_HISTOGRAM_MEDIUM_TIMES("Sync.UserPerceivedAuthorizationTime",
-                                 base::TimeTicks::Now() - login_start_time_);
-      break;
     default:
       break;
   }
 
-  service_->SetUIShouldDepictAuthInProgress(false);
   service_->OnUserCancelledDialog();
   delete this;
 }
 
-void SyncSetupFlow::OnUserSubmittedAuth(const std::string& username,
-                                        const std::string& password,
-                                        const std::string& captcha,
-                                        const std::string& access_code) {
-  last_attempted_user_email_ = username;
-  service_->SetUIShouldDepictAuthInProgress(true);
-
-  // If we're just being called to provide an ASP, then pass it to the
-  // SigninManager and wait for the next step.
-  if (!access_code.empty()) {
-    service_->signin()->ProvideSecondFactorAccessCode(access_code);
-    return;
-  }
-
-  // Kick off a sign-in through the signin manager.
-  SigninManager* signin = service_->signin();
-  signin->StartSignIn(username,
-                      password,
-                      signin->GetLoginAuthError().captcha().token,
-                      captcha);
-}
-
-void SyncSetupFlow::OnUserSubmittedOAuth(
-    const std::string& oauth1_request_token) {
-  GaiaOAuthFetcher* fetcher = new GaiaOAuthFetcher(
-      service_->signin(),
-      service_->profile()->GetRequestContext(),
-      service_->profile(),
-      GaiaConstants::kSyncServiceOAuth);
-  service_->signin()->StartOAuthSignIn(oauth1_request_token, fetcher);
-}
-
 void SyncSetupFlow::OnUserConfigured(const SyncConfiguration& configuration) {
   // Update sync histograms. This is a no-op if |configuration| has not changed.
   UpdateHistogram(configuration, service_);
 
   // Go to the "loading..." screen.
   Advance(SyncSetupWizard::SETTING_UP);
 
   // Note: encryption will not occur until OnUserChoseDatatypes is called.
   if (configuration.encrypt_all)
     service_->EnableEncryptEverything();
@@ skipping 65 matching lines @@
 }
 
 // Use static Run method to get an instance.
 SyncSetupFlow::SyncSetupFlow(SyncSetupWizard::State start_state,
                              SyncSetupWizard::State end_state,
                              SyncSetupFlowContainer* container,
                              ProfileSyncService* service)
     : container_(container),
       current_state_(start_state),
       end_state_(end_state),
-      login_start_time_(base::TimeTicks::Now()),
       flow_handler_(NULL),
       service_(service),
       user_tried_creating_explicit_passphrase_(false),
       user_tried_setting_passphrase_(false) {
 }
 
 // Returns true if the flow should advance to |state| based on |current_state_|.
 bool SyncSetupFlow::ShouldAdvance(SyncSetupWizard::State state) {
   switch (state) {
-    case SyncSetupWizard::OAUTH_LOGIN:
-      return current_state_ == SyncSetupWizard::FATAL_ERROR ||
-             current_state_ == SyncSetupWizard::OAUTH_LOGIN ||
-             current_state_ == SyncSetupWizard::SETTING_UP;
-    case SyncSetupWizard::GAIA_LOGIN:
-      return current_state_ == SyncSetupWizard::FATAL_ERROR ||
-             current_state_ == SyncSetupWizard::GAIA_LOGIN ||
-             current_state_ == SyncSetupWizard::SETTING_UP;
-    case SyncSetupWizard::GAIA_SUCCESS:
-      return current_state_ == SyncSetupWizard::GAIA_LOGIN ||
-             current_state_ == SyncSetupWizard::OAUTH_LOGIN;
     case SyncSetupWizard::SYNC_EVERYTHING:  // Intentionally fall through.
     case SyncSetupWizard::CONFIGURE:
-      return current_state_ == SyncSetupWizard::GAIA_SUCCESS;
+      return current_state_ != SyncSetupWizard::SETTING_UP;
     case SyncSetupWizard::ENTER_PASSPHRASE:
-      return (service_->auto_start_enabled() &&
-              current_state_ == SyncSetupWizard::GAIA_LOGIN) ||
-             current_state_ == SyncSetupWizard::SYNC_EVERYTHING ||
+      return current_state_ == SyncSetupWizard::SYNC_EVERYTHING ||
              current_state_ == SyncSetupWizard::CONFIGURE ||
              current_state_ == SyncSetupWizard::SETTING_UP;
-    case SyncSetupWizard::SETUP_ABORTED_BY_PENDING_CLEAR:
-      return current_state_ != SyncSetupWizard::ABORT;
     case SyncSetupWizard::SETTING_UP:
       return current_state_ == SyncSetupWizard::SYNC_EVERYTHING ||
              current_state_ == SyncSetupWizard::CONFIGURE ||
              current_state_ == SyncSetupWizard::ENTER_PASSPHRASE;
-    case SyncSetupWizard::NONFATAL_ERROR:  // Intentionally fall through.
     case SyncSetupWizard::FATAL_ERROR:
       return current_state_ != SyncSetupWizard::ABORT;
     case SyncSetupWizard::ABORT:
       return true;
     case SyncSetupWizard::DONE:
       return current_state_ == SyncSetupWizard::SETTING_UP ||
              current_state_ == SyncSetupWizard::ENTER_PASSPHRASE;
     default:
       NOTREACHED() << "Unhandled State: " << state;
       return false;
   }
 }
 
 void SyncSetupFlow::ActivateState(SyncSetupWizard::State state) {
   DCHECK(flow_handler_);
 
-  if (state == SyncSetupWizard::NONFATAL_ERROR)
-    state = GetStepForNonFatalError(service_);
-
   current_state_ = state;
 
   switch (state) {
-    case SyncSetupWizard::OAUTH_LOGIN: {
-      flow_handler_->ShowOAuthLogin();
-      break;
-    }
-    case SyncSetupWizard::GAIA_LOGIN: {
-      DictionaryValue args;
-      GetArgsForGaiaLogin(&args);
-      flow_handler_->ShowGaiaLogin(args);
-      break;
-    }
-    case SyncSetupWizard::GAIA_SUCCESS:
-      // Authentication is complete now.
-      service_->SetUIShouldDepictAuthInProgress(false);
-      if (end_state_ == SyncSetupWizard::GAIA_SUCCESS) {
-        flow_handler_->ShowGaiaSuccessAndClose();
-        break;
-      }
-      flow_handler_->ShowGaiaSuccessAndSettingUp();
-      break;
     case SyncSetupWizard::SYNC_EVERYTHING: {
       DictionaryValue args;
       GetArgsForConfigure(&args);
       args.SetBoolean("showSyncEverythingPage", true);
       flow_handler_->ShowConfigure(args);
       break;
     }
     case SyncSetupWizard::CONFIGURE: {
       DictionaryValue args;
       GetArgsForConfigure(&args);
       flow_handler_->ShowConfigure(args);
       break;
     }
     case SyncSetupWizard::ENTER_PASSPHRASE: {
       DictionaryValue args;
       GetArgsForConfigure(&args);
       // TODO(atwilson): Remove ShowPassphraseEntry in favor of using
       // ShowConfigure() - http://crbug.com/90786.
       flow_handler_->ShowPassphraseEntry(args);
       break;
     }
-    case SyncSetupWizard::SETUP_ABORTED_BY_PENDING_CLEAR: {
-      // TODO(sync): We should expose a real "display an error" API on
-      // SyncSetupFlowHandler (crbug.com/92722) but for now just transition
-      // to the login state with a special error code.
-      DictionaryValue args;
-      GetArgsForGaiaLogin(&args);
-      args.SetInteger("error", GoogleServiceAuthError::SERVICE_UNAVAILABLE);
-      current_state_ = SyncSetupWizard::GAIA_LOGIN;
-      flow_handler_->ShowGaiaLogin(args);
-      break;
-    }
     case SyncSetupWizard::SETTING_UP: {
       flow_handler_->ShowSettingUp();
       break;
     }
     case SyncSetupWizard::FATAL_ERROR: {
       // This shows the user the "Could not connect to server" error.
       // TODO(sync): Update this error handling to allow different platforms to
       // display the error appropriately (http://crbug.com/92722).
-      DictionaryValue args;
-      GetArgsForGaiaLogin(&args);
-      args.SetBoolean("fatalError", true);
-      current_state_ = SyncSetupWizard::GAIA_LOGIN;
-      flow_handler_->ShowGaiaLogin(args);
+      flow_handler_->ShowFatalError();
       break;
     }
     case SyncSetupWizard::DONE:
     case SyncSetupWizard::ABORT:
       flow_handler_->ShowSetupDone(UTF8ToUTF16(
           service_->profile()->GetPrefs()->GetString(
           prefs::kGoogleServicesUsername)));
       break;
     default:
       NOTREACHED() << "Invalid advance state: " << state;
   }
 }