[sync] Force re-auth during sync setup if Oauth2 token is unavailable

chrome/browser/ui/webui/sync_setup_handler.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/ui/webui/sync_setup_handler.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
@@ skipping 826 matching lines @@
 void SyncSetupHandler::OpenSyncSetup() {
   if (!PrepareSyncSetup())
     return;
 
   // There are several different UI flows that can bring the user here:
   // 1) Signin promo.
   // 2) Normal signin through settings page (GetAuthenticatedUsername() is
   //    empty).
   // 3) Previously working credentials have expired.
   // 4) User is signed in, but has stopped sync via the google dashboard, and
-  //    signout is prohibited by policy so we need to force a re-auth.
+  //    signout is prohibited by policy so we need to force a re-auth to update
+  //    ProfileSyncService's auth token.
   // 5) User clicks [Advanced Settings] button on options page while already
   //    logged in.
   // 6) One-click signin (credentials are already available, so should display
   //    sync configure UI, not login UI).
   // 7) User re-enables sync after disabling it via advanced settings.
 #if !defined(OS_CHROMEOS)
   SigninManagerBase* signin =
       SigninManagerFactory::GetForProfile(GetProfile());
-
+  ProfileSyncService* service = GetSyncService();
   if (signin->GetAuthenticatedUsername().empty() ||
-      SigninGlobalError::GetForProfile(GetProfile())->HasMenuItem()) {
+      SigninGlobalError::GetForProfile(GetProfile())->HasMenuItem() ||
+      (service && !service->IsOAuthRefreshTokenAvailable())) {

[Andrew T Wilson (Slow), 2013/08/21 08:30:46]

I think this probably isn't the right way to do this. If you are signed in but
don't have an OAuth token, the ProfileOAuth2TokenService (or some maybe some
other service) should be generating an auth error on startup (so, you'd end up
with HasMenuItem() returning true).

Maybe you can ping fgorski about the best way to add this to
ProfileOAuth2TokenService? It's just not ideal that Chrome doesn't have an oauth
token, but the only way the user would find out about this is if they happen to
try to setup sync.

[Raghu Simha, 2013/08/22 00:05:12]

Agreed. I've sent out a new CL with a different approach, and added fgorski as a
reviewer.

     // User is not logged in (cases 1-2), or login has been specially requested
-    // because previously working credentials have expired (case 3). Close sync
-    // setup including any visible overlays, and display the gaia auth page.
-    // Control will be returned to the sync settings page once auth is complete.
+    // because previously working credentials have expired (case 3), or sync
+    // no longer has a valid auth token (case 4). Close sync setup including any
+    // visible overlays, and display the gaia auth page. Control will be
+    // returned to the sync settings page once auth is complete.
     CloseSyncSetup();
     DisplayGaiaLogin();
     return;
   }
 #endif
   if (!GetSyncService()) {
     // This can happen if the user directly navigates to /settings/syncSetup.
     DLOG(WARNING) << "Cannot display sync UI when sync is disabled";
     CloseSyncSetup();
     return;
   }
 
   // User is already logged in. They must have brought up the config wizard
-  // via the "Advanced..." button or through One-Click signin (cases 4-6), or
+  // via the "Advanced..." button or through One-Click signin (cases 5-6), or
   // they are re-enabling sync after having disabled it (case 7).
   DisplayConfigureSync(true, false);
 }
 
 void SyncSetupHandler::OpenConfigureSync() {
   if (!PrepareSyncSetup())
     return;
 
   DisplayConfigureSync(true, false);
 }
@@ skipping 21 matching lines @@
 
   LoginUIService* service = GetLoginUIService();
   DCHECK(service);
   service->current_login_ui()->FocusUI();
   return true;
 }
 
 LoginUIService* SyncSetupHandler::GetLoginUIService() const {
   return LoginUIServiceFactory::GetForProfile(GetProfile());
 }