Pass Device ID in the oauth2/token request. Keep Device ID in local state on Chrome OS.

google_apis/gaia/gaia_auth_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 "google_apis/gaia/gaia_auth_fetcher.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 97 matching lines @@
 const char GaiaAuthFetcher::kClientLoginToOAuth2WithDeviceTypeBodyFormat[] =
     "scope=%s&client_id=%s&device_type=chrome";
 // static
 const char GaiaAuthFetcher::kOAuth2CodeToTokenPairBodyFormat[] =
     "scope=%s&"
     "grant_type=authorization_code&"
     "client_id=%s&"
     "client_secret=%s&"
     "code=%s";
 // static
+const char GaiaAuthFetcher::kOAuth2CodeToTokenPairDeviceIdParam[] =
+    "device_id=%s&device_type=chrome";
+// static
 const char GaiaAuthFetcher::kOAuth2RevokeTokenBodyFormat[] =
     "token=%s";
 // static
 const char GaiaAuthFetcher::kGetUserInfoFormat[] =
     "LSID=%s";
 // static
 const char GaiaAuthFetcher::kMergeSessionFormat[] =
     "uberauth=%s&"
     "continue=%s&"
     "source=%s";
@@ skipping 206 matching lines @@
                               encoded_client_id.c_str());
   } else {
     return base::StringPrintf(kClientLoginToOAuth2BodyFormat,
                               encoded_scope.c_str(),
                               encoded_client_id.c_str());
   }
 }
 
 // static
 std::string GaiaAuthFetcher::MakeGetTokenPairBody(
-    const std::string& auth_code) {
+    const std::string& auth_code,
+    const std::string& device_id) {
   std::string encoded_scope = net::EscapeUrlEncodedData(
       GaiaConstants::kOAuth1LoginScope, true);
   std::string encoded_client_id = net::EscapeUrlEncodedData(
       GaiaUrls::GetInstance()->oauth2_chrome_client_id(), true);
   std::string encoded_client_secret = net::EscapeUrlEncodedData(
       GaiaUrls::GetInstance()->oauth2_chrome_client_secret(), true);
   std::string encoded_auth_code = net::EscapeUrlEncodedData(auth_code, true);
-  return base::StringPrintf(kOAuth2CodeToTokenPairBodyFormat,
-                            encoded_scope.c_str(),
-                            encoded_client_id.c_str(),
-                            encoded_client_secret.c_str(),
-                            encoded_auth_code.c_str());
+  std::string body = base::StringPrintf(
+      kOAuth2CodeToTokenPairBodyFormat, encoded_scope.c_str(),
+      encoded_client_id.c_str(), encoded_client_secret.c_str(),
+      encoded_auth_code.c_str());
+  if (!device_id.empty())

[achuithb, 2015/05/12 23:25:01]

nit: Believe you need {} here?

[dzhioev (left Google), 2015/05/13 00:25:18]

Done.

+    body += "&" + base::StringPrintf(kOAuth2CodeToTokenPairDeviceIdParam,
+                                     device_id.c_str());
+  return body;
 }
 
 // static
 std::string GaiaAuthFetcher::MakeRevokeTokenBody(
     const std::string& auth_token) {
   return base::StringPrintf(kOAuth2RevokeTokenBodyFormat, auth_token.c_str());
 }
 
 // static
 std::string GaiaAuthFetcher::MakeGetUserInfoBody(const std::string& lsid) {
@@ skipping 304 matching lines @@
 
   fetcher_ =
       CreateGaiaFetcher(getter_, request_body_, device_id_header,
                         client_login_to_oauth2_gurl_, net::LOAD_NORMAL, this);
   fetch_pending_ = true;
   fetcher_->Start();
 }
 
 void GaiaAuthFetcher::StartAuthCodeForOAuth2TokenExchange(
     const std::string& auth_code) {
+  StartAuthCodeForOAuth2TokenExchangeWithDeviceId(auth_code, std::string());
+}
+
+void GaiaAuthFetcher::StartAuthCodeForOAuth2TokenExchangeWithDeviceId(
+    const std::string& auth_code,
+    const std::string& device_id) {
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
 
   DVLOG(1) << "Starting OAuth token pair fetch";
-  request_body_ = MakeGetTokenPairBody(auth_code);
+  request_body_ = MakeGetTokenPairBody(auth_code, device_id);
   fetcher_ =
       CreateGaiaFetcher(getter_, request_body_, std::string(),
                         oauth2_token_gurl_, kLoadFlagsIgnoreCookies, this);
   fetch_pending_ = true;
   fetcher_->Start();
 }
 
 void GaiaAuthFetcher::StartGetUserInfo(const std::string& lsid) {
   DCHECK(!fetch_pending_) << "Tried to fetch two things at once!";
 
@@ skipping 411 matching lines @@
   return alleged_error.find(kSecondFactor) !=
       std::string::npos;
 }
 
 // static
 bool GaiaAuthFetcher::IsWebLoginRequiredSuccess(
     const std::string& alleged_error) {
   return alleged_error.find(kWebLoginRequired) !=
       std::string::npos;
 }