Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6354)

Unified Diff: chrome/service/cloud_print/cloud_print_auth.cc

Issue 17109006: Device robot refresh token integrity validation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: addressed atwilson's review comments Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/service/cloud_print/cloud_print_auth.cc
diff --git a/chrome/service/cloud_print/cloud_print_auth.cc b/chrome/service/cloud_print/cloud_print_auth.cc
index 5f7c57e4e9da7ea78f499c5c9385dc7d8e7afb15..e20d8463e780b8aae88e44c6016c977f7e90b997 100644
--- a/chrome/service/cloud_print/cloud_print_auth.cc
+++ b/chrome/service/cloud_print/cloud_print_auth.cc
@@ -95,7 +95,6 @@ void CloudPrintAuth::AuthenticateWithRobotAuthCode(
robot_email_ = robot_email;
// Now that we have an auth code we need to get the refresh and access tokens.
oauth_client_.reset(new gaia::GaiaOAuthClient(
- GaiaUrls::GetInstance()->oauth2_token_url(),
g_service_process->GetServiceURLRequestContextGetter()));
oauth_client_->GetTokensFromAuthCode(oauth_client_info_,
robot_oauth_auth_code,
@@ -105,10 +104,11 @@ void CloudPrintAuth::AuthenticateWithRobotAuthCode(
void CloudPrintAuth::RefreshAccessToken() {
oauth_client_.reset(new gaia::GaiaOAuthClient(
- GaiaUrls::GetInstance()->oauth2_token_url(),
g_service_process->GetServiceURLRequestContextGetter()));
+ std::vector<std::string> empty_scope_list; // (Use scope from refresh token.)
oauth_client_->RefreshToken(oauth_client_info_,
refresh_token_,
+ empty_scope_list,
kCloudPrintAuthMaxRetryCount,
this);
}
@@ -172,7 +172,6 @@ CloudPrintURLFetcher::ResponseAction CloudPrintAuth::HandleJSONData(
json_data->GetString(kXMPPJidValue, &robot_email_);
// Now that we have an auth code we need to get the refresh and access tokens.
oauth_client_.reset(new gaia::GaiaOAuthClient(
- GaiaUrls::GetInstance()->oauth2_token_url(),
g_service_process->GetServiceURLRequestContextGetter()));
oauth_client_->GetTokensFromAuthCode(oauth_client_info_,
auth_code,

Powered by Google App Engine
This is Rietveld 408576698