OAuth2 sign-in flow for ChromeOS

chrome/browser/net/gaia/gaia_oauth_fetcher.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/net/gaia/gaia_oauth_fetcher.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/json/json_reader.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
+#include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/net/gaia/gaia_oauth_consumer.h"
 #include "chrome/common/net/url_util.h"
 #include "google_apis/gaia/gaia_auth_fetcher.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/oauth_request_signer.h"
 #include "grit/chromium_strings.h"
+#include "net/base/escape.h"
 #include "net/base/load_flags.h"
 #include "net/cookies/parsed_cookie.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "net/url_request/url_request_status.h"
 #include "ui/base/l10n/l10n_util.h"
 
-static const char kOAuthTokenCookie[] = "oauth_token";
+namespace {
+
+const char kOAuthTokenCookie[] = "oauth_token";
+const char kOAuth2LoginBodyFormat[] =
+    "source=%s&"
+    "service=%s";

[xiyuan, 2013/01/07 23:07:55]

kOAuth2LoginBodyFormat is not used anywhere. And I don't see where we set
|request_type_| to OAUTH2_LOGIN and OAUTH2_REVOKE_TOKEN either.

Is the snapshot up-to-date?

[zel, 2013/01/08 02:05:41]

changes to gaia_oauth_fetcher.cc/h are reverted now

+
+}  // namespace
 
 GaiaOAuthFetcher::GaiaOAuthFetcher(GaiaOAuthConsumer* consumer,
                                    net::URLRequestContextGetter* getter,
                                    const std::string& service_scope)
     : consumer_(consumer),
       getter_(getter),
       service_scope_(service_scope),
       fetch_pending_(false),
       auto_fetch_limit_(USER_INFO) {}
 
@@ skipping 206 matching lines @@
     DictionaryValue* dict = static_cast<DictionaryValue*>(value.get());
     if (dict->Get("email", &email_value)) {
       if (email_value->GetType() == base::Value::TYPE_STRING) {
         StringValue* email = static_cast<StringValue*>(email_value);
         email->GetAsString(email_result);
       }
     }
   }
 }
 
-void GaiaOAuthFetcher::StartOAuthLogin(
+void GaiaOAuthFetcher::StartOAuth1Login(
     const char* source,
     const char* service,
     const std::string& oauth1_access_token,
     const std::string& oauth1_access_token_secret) {
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
 
   request_type_ = OAUTH1_LOGIN;
   // Must outlive fetcher_.
   request_body_ = MakeOAuthLoginBody(source, service, oauth1_access_token,
                                      oauth1_access_token_secret);
@@ skipping 274 matching lines @@
   switch (request_type_) {
     case OAUTH1_LOGIN:
       OnOAuthLoginFetched(data, status, response_code);
       break;
     case OAUTH1_REQUEST_TOKEN:
       OnGetOAuthTokenUrlFetched(source->GetCookies(), status, response_code);
       break;
     case OAUTH1_ALL_ACCESS_TOKEN:
       OnOAuthGetAccessTokenFetched(data, status, response_code);
       break;
+    case OAUTH2_LOGIN:
+      OnOAuthLoginFetched(data, status, response_code);
+      break;
     case OAUTH2_SERVICE_ACCESS_TOKEN:
       OnOAuthWrapBridgeFetched(data, status, response_code);
       break;
+    case OAUTH2_REVOKE_TOKEN:
+      OnOAuthRevokeTokenFetched(data, status, response_code);
+      break;
     case USER_INFO:
       OnUserInfoFetched(data, status, response_code);
       break;
-    case OAUTH2_REVOKE_TOKEN:
-      OnOAuthRevokeTokenFetched(data, status, response_code);
-      break;
   }
 }
 
 bool GaiaOAuthFetcher::ShouldAutoFetch(RequestType fetch_step) {
   return fetch_step <= auto_fetch_limit_;
 }