Support for auth code based authentication flow for both app and web UI driven flow.

chrome/browser/chromeos/login/oauth2_token_fetcher.cc

 // Copyright (c) 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/chromeos/login/oauth2_token_fetcher.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/net/connectivity_state_helper.h"
@@ skipping 24 matching lines @@
     net::URLRequestContextGetter* context_getter)
     : delegate_(delegate),
       auth_fetcher_(this, GaiaConstants::kChromeSource, context_getter),
       retry_count_(0) {
   DCHECK(delegate);
 }
 
 OAuth2TokenFetcher::~OAuth2TokenFetcher() {
 }
 
-void OAuth2TokenFetcher::Start() {
+void OAuth2TokenFetcher::StartExchangeFromCookies() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Delay the verification if the network is not connected or on a captive
   // portal.
   ConnectivityStateHelper* csh = ConnectivityStateHelper::Get();
   if (!csh->DefaultNetworkOnline()) {
     // If network is offline, defer the token fetching until online.
     VLOG(1) << "Network is offline.  Deferring OAuth2 token fetch.";
     BrowserThread::PostDelayedTask(
         BrowserThread::UI, FROM_HERE,
-        base::Bind(&OAuth2TokenFetcher::Start, AsWeakPtr()),
+        base::Bind(&OAuth2TokenFetcher::StartExchangeFromCookies,
+                   AsWeakPtr()),
         base::TimeDelta::FromMilliseconds(kRequestRestartDelay));
     return;
   }
   auth_fetcher_.StartCookieForOAuthLoginTokenExchange(EmptyString());
 }
 
+void OAuth2TokenFetcher::StartExchangeFromAuthCode(
+    const std::string& auth_code) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  auth_code_ = auth_code;
+  // Delay the verification if the network is not connected or on a captive
+  // portal.
+  ConnectivityStateHelper* csh = ConnectivityStateHelper::Get();
+  if (!csh->DefaultNetworkOnline()) {
+    // If network is offline, defer the token fetching until online.
+    VLOG(1) << "Network is offline.  Deferring OAuth2 token fetch.";
+    BrowserThread::PostDelayedTask(
+        BrowserThread::UI, FROM_HERE,
+        base::Bind(&OAuth2TokenFetcher::StartExchangeFromAuthCode,
+                   AsWeakPtr(),
+                   auth_code),
+        base::TimeDelta::FromMilliseconds(kRequestRestartDelay));
+    return;
+  }
+  auth_fetcher_.StartAuthCodeForOAuth2TokenExchange(auth_code);
+}
+
 void OAuth2TokenFetcher::OnClientOAuthSuccess(
     const GaiaAuthConsumer::ClientOAuthResult& oauth_tokens) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   LOG(INFO) << "Got OAuth2 tokens!";
   retry_count_ = 0;
   oauth_tokens_ = oauth_tokens;
   delegate_->OnOAuth2TokensAvailable(oauth_tokens_);
 }
 
 void OAuth2TokenFetcher::OnClientOAuthFailure(
     const GoogleServiceAuthError& error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  RetryOnError(error,
-               base::Bind(&OAuth2TokenFetcher::Start, AsWeakPtr()),
-               base::Bind(&Delegate::OnOAuth2TokensFetchFailed,
-                          base::Unretained(delegate_)));
+  RetryOnError(
+      error,
+      auth_code_.empty() ?
+          base::Bind(&OAuth2TokenFetcher::StartExchangeFromCookies,
+                     AsWeakPtr()) :
+          base::Bind(&OAuth2TokenFetcher::StartExchangeFromAuthCode,
+                     AsWeakPtr(), auth_code_),
+      base::Bind(&Delegate::OnOAuth2TokensFetchFailed,
+                 base::Unretained(delegate_)));
 }
 
 void OAuth2TokenFetcher::RetryOnError(const GoogleServiceAuthError& error,
                                       const base::Closure& task,
                                       const base::Closure& error_handler) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if ((error.state() == GoogleServiceAuthError::CONNECTION_FAILED ||
        error.state() == GoogleServiceAuthError::SERVICE_UNAVAILABLE ||
        error.state() == GoogleServiceAuthError::REQUEST_CANCELED) &&
       retry_count_ < kMaxRequestAttemptCount) {
     retry_count_++;
     BrowserThread::PostDelayedTask(
         BrowserThread::UI, FROM_HERE, task,
         base::TimeDelta::FromMilliseconds(kRequestRestartDelay));
     return;
   }
   LOG(INFO) << "Unrecoverable error or retry count max reached.";
   error_handler.Run();
 }
 
 }  // namespace chromeos