Identity API: Pop-up a sign-in dialog if gaia credentials are bad

chrome/browser/extensions/api/identity/identity_api.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/extensions/api/identity/identity_api.h"
 
 #include "base/lazy_instance.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
@@ skipping 27 matching lines @@
 const char kUserRejected[] = "The user did not approve access.";
 const char kUserNotSignedIn[] = "The user is not signed in.";
 const char kInvalidRedirect[] = "Did not redirect to the right URL.";
 }  // namespace identity_constants
 
 namespace GetAuthToken = api::experimental_identity::GetAuthToken;
 namespace LaunchWebAuthFlow = api::experimental_identity::LaunchWebAuthFlow;
 namespace identity = api::experimental_identity;
 
 IdentityGetAuthTokenFunction::IdentityGetAuthTokenFunction()
-    : interactive_(false) {}
+    : interactive_(false),
+      should_retry_with_signin_(false) {}
 IdentityGetAuthTokenFunction::~IdentityGetAuthTokenFunction() {}
 
 bool IdentityGetAuthTokenFunction::RunImpl() {
   scoped_ptr<GetAuthToken::Params> params(GetAuthToken::Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params.get());
   if (params->details.get() && params->details->interactive.get())
     interactive_ = *params->details->interactive;
+  should_retry_with_signin_ = interactive_;
 
   const OAuth2Info& oauth2_info = OAuth2Info::GetOAuth2Info(GetExtension());
 
   // Check that the necessary information is present in the manfist.
   if (oauth2_info.client_id.empty()) {
     error_ = identity_constants::kInvalidClientId;
     return false;
   }
 
   if (oauth2_info.scopes.size() == 0) {
@@ skipping 24 matching lines @@
 
 void IdentityGetAuthTokenFunction::OnMintTokenSuccess(
     const std::string& access_token) {
   SetResult(Value::CreateStringValue(access_token));
   SendResponse(true);
   Release();  // Balanced in RunImpl.
 }
 
 void IdentityGetAuthTokenFunction::OnMintTokenFailure(
     const GoogleServiceAuthError& error) {
+  if (should_retry_with_signin_) {
+    switch (error.state()) {
+      case GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS:
+      case GoogleServiceAuthError::ACCOUNT_DELETED:
+      case GoogleServiceAuthError::ACCOUNT_DISABLED:
+        ShowLoginPopup();
+        return;
+      default:
+        // Return error to caller.
+        break;
+    }
+  }
+

[Pete Williamson, 2013/03/22 16:42:34]

How will the user know *why* they are being asked to signin?  If I were the
user, and I saw this dialog when I thought chrome was signed in, I'd be
confused.

[Michael Courage, 2013/03/25 21:28:04]

There is nothing on the sign in screen that explains. This only happens when the
interactive flag is set though, so typically the dialog will pop up right after
the user clicked a button labeled "Sign In" or something similar.

   error_ = std::string(identity_constants::kAuthFailure) + error.ToString();
   SendResponse(false);
   Release();  // Balanced in RunImpl.
 }
 
 void IdentityGetAuthTokenFunction::OnIssueAdviceSuccess(
     const IssueAdviceInfo& issue_advice) {
   // Existing grant was revoked and we used NO_FORCE, so we got info back
   // instead.
   if (interactive_) {
@@ skipping 56 matching lines @@
   login_ui_service->AddObserver(this);
 }
 
 void IdentityGetAuthTokenFunction::StopObservingLoginService() {
   LoginUIService* login_ui_service =
       LoginUIServiceFactory::GetForProfile(profile());
   login_ui_service->RemoveObserver(this);
 }
 
 void IdentityGetAuthTokenFunction::ShowLoginPopup() {
+  should_retry_with_signin_ = false;
   StartObservingLoginService();
 
   LoginUIService* login_ui_service =
       LoginUIServiceFactory::GetForProfile(profile());
   login_ui_service->ShowLoginPopup();
 }
 
 void IdentityGetAuthTokenFunction::ShowOAuthApprovalDialog(
     const IssueAdviceInfo& issue_advice) {
   install_ui_->ConfirmIssueAdvice(this, GetExtension(), issue_advice);
@@ skipping 79 matching lines @@
 
 static base::LazyInstance<ProfileKeyedAPIFactory<IdentityAPI> >
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 // static
 ProfileKeyedAPIFactory<IdentityAPI>* IdentityAPI::GetFactoryInstance() {
   return &g_factory.Get();
 }
 
 }  // namespace extensions