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

Unified Diff: google_apis/gaia/gaia_oauth_client.cc

Issue 265563002: Revert of Use new people.get api instead of oauth2/v1/userinfo. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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
« no previous file with comments | « google_apis/gaia/gaia_oauth_client.h ('k') | google_apis/gaia/gaia_oauth_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google_apis/gaia/gaia_oauth_client.cc
diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc
index 1d5f9eb893337f22f2ec4b5fd8d2cf0f0a3f7bcc..1113ff6730921c86dd0a4255c9112b37d2837423 100644
--- a/google_apis/gaia/gaia_oauth_client.cc
+++ b/google_apis/gaia/gaia_oauth_client.cc
@@ -56,9 +56,6 @@
void GetUserId(const std::string& oauth_access_token,
int max_retries,
Delegate* delegate);
- void GetUserInfo(const std::string& oauth_access_token,
- int max_retries,
- Delegate* delegate);
void GetTokenInfo(const std::string& oauth_access_token,
int max_retries,
Delegate* delegate);
@@ -76,14 +73,13 @@
TOKEN_INFO,
USER_EMAIL,
USER_ID,
- USER_INFO,
};
virtual ~Core() {}
- void PeopleGet(const std::string& oauth_access_token,
- int max_retries,
- Delegate* delegate);
+ void GetUserInfo(const std::string& oauth_access_token,
+ int max_retries,
+ Delegate* delegate);
void MakeGaiaRequest(const GURL& url,
const std::string& post_body,
int max_retries,
@@ -149,7 +145,7 @@
DCHECK_EQ(request_type_, NO_PENDING_REQUEST);
DCHECK(!request_.get());
request_type_ = USER_EMAIL;
- PeopleGet(oauth_access_token, max_retries, delegate);
+ GetUserInfo(oauth_access_token, max_retries, delegate);
}
void GaiaOAuthClient::Core::GetUserId(const std::string& oauth_access_token,
@@ -158,25 +154,16 @@
DCHECK_EQ(request_type_, NO_PENDING_REQUEST);
DCHECK(!request_.get());
request_type_ = USER_ID;
- PeopleGet(oauth_access_token, max_retries, delegate);
+ GetUserInfo(oauth_access_token, max_retries, delegate);
}
void GaiaOAuthClient::Core::GetUserInfo(const std::string& oauth_access_token,
int max_retries,
Delegate* delegate) {
- DCHECK_EQ(request_type_, NO_PENDING_REQUEST);
- DCHECK(!request_.get());
- request_type_ = USER_INFO;
- PeopleGet(oauth_access_token, max_retries, delegate);
-}
-
-void GaiaOAuthClient::Core::PeopleGet(const std::string& oauth_access_token,
- int max_retries,
- Delegate* delegate) {
delegate_ = delegate;
num_retries_ = 0;
request_.reset(net::URLFetcher::Create(
- kUrlFetcherId, GURL(GaiaUrls::GetInstance()->people_get_url()),
+ kUrlFetcherId, GURL(GaiaUrls::GetInstance()->oauth_user_info_url()),
net::URLFetcher::GET, this));
request_->SetRequestContext(request_context_getter_.get());
request_->AddExtraRequestHeader("Authorization: OAuth " + oauth_access_token);
@@ -295,27 +282,9 @@
switch (type) {
case USER_EMAIL: {
- // Use first email of type "account" as the user's email.
- const base::ListValue* emails_list;
- bool email_found = false;
- if (response_dict->GetList("emails", &emails_list)) {
- for (size_t i = 0; i < emails_list->GetSize(); ++i) {
- const base::DictionaryValue* email_dict;
- if (emails_list->GetDictionary(i, &email_dict)) {
- std::string email;
- std::string type;
- if (email_dict->GetString("type", &type) &&
- type == "account" &&
- email_dict->GetString("value", &email)) {
- delegate_->OnGetUserEmailResponse(email);
- email_found = true;
- break;
- }
- }
- }
- }
- if (!email_found)
- delegate_->OnNetworkError(net::URLFetcher::RESPONSE_CODE_INVALID);
+ std::string email;
+ response_dict->GetString("email", &email);
+ delegate_->OnGetUserEmailResponse(email);
break;
}
@@ -323,11 +292,6 @@
std::string id;
response_dict->GetString("id", &id);
delegate_->OnGetUserIdResponse(id);
- break;
- }
-
- case USER_INFO: {
- delegate_->OnGetUserInfoResponse(response_dict.Pass());
break;
}
@@ -408,12 +372,6 @@
return core_->GetUserId(access_token, max_retries, delegate);
}
-void GaiaOAuthClient::GetUserInfo(const std::string& access_token,
- int max_retries,
- Delegate* delegate) {
- return core_->GetUserInfo(access_token, max_retries, delegate);
-}
-
void GaiaOAuthClient::GetTokenInfo(const std::string& access_token,
int max_retries,
Delegate* delegate) {
« no previous file with comments | « google_apis/gaia/gaia_oauth_client.h ('k') | google_apis/gaia/gaia_oauth_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698