diff options
| -rw-r--r-- | chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc | 7 | ||||
| -rw-r--r-- | google_apis/gaia/fake_gaia.cc | 8 | ||||
| -rw-r--r-- | google_apis/gaia/fake_gaia.h | 2 | ||||
| -rw-r--r-- | google_apis/gaia/gaia_urls.cc | 4 |
4 files changed, 9 insertions, 12 deletions
diff --git a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc index 049c95a..2adb5338 100644 --- a/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc +++ b/chrome/browser/ui/webui/local_discovery/local_discovery_ui_browsertest.cc @@ -272,9 +272,6 @@ const char kURLCloudPrintConfirm[] = const char kURLRegisterComplete[] = "http://1.2.3.4:8888/privet/register?action=complete&user=user%40host.com"; -const char kURLGaiaToken[] = - "https://accounts.google.com/o/oauth2/token"; - const char kSampleGaiaId[] = "12345"; const char kSampleUser[] = "user@host.com"; @@ -398,13 +395,13 @@ class LocalDiscoveryUITest : public WebUIBrowserTest { net::URLRequestStatus::SUCCESS); fake_fetcher_factory().SetFakeResponse( - GURL(kURLGaiaToken), + GaiaUrls::GetInstance()->oauth2_token_url(), kResponseGaiaToken, net::HTTP_OK, net::URLRequestStatus::SUCCESS); EXPECT_CALL(fake_url_fetcher_creator(), OnCreateFakeURLFetcher( - kURLGaiaToken)) + GaiaUrls::GetInstance()->oauth2_token_url().spec())) .Times(AnyNumber()); fake_fetcher_factory().SetFakeResponse( diff --git a/google_apis/gaia/fake_gaia.cc b/google_apis/gaia/fake_gaia.cc index 456d8db..4c0db5a 100644 --- a/google_apis/gaia/fake_gaia.cc +++ b/google_apis/gaia/fake_gaia.cc @@ -266,7 +266,7 @@ void FakeGaia::Initialize() { // Handles /SSO GAIA call (not GAIA, made up for SAML tests). REGISTER_PATH_RESPONSE_HANDLER("/SSO", HandleSSO); - // Handles /o/oauth2/token GAIA call. + // Handles /oauth2/v4/token GAIA call. REGISTER_RESPONSE_HANDLER( gaia_urls->oauth2_token_url(), HandleAuthToken); @@ -624,7 +624,7 @@ void FakeGaia::HandleAuthToken(const HttpRequest& request, std::string grant_type; if (!GetQueryParameter(request.content, "grant_type", &grant_type)) { http_response->set_code(net::HTTP_BAD_REQUEST); - LOG(ERROR) << "No 'grant_type' param in /o/oauth2/token"; + LOG(ERROR) << "No 'grant_type' param in /oauth2/v4/token"; return; } @@ -633,7 +633,7 @@ void FakeGaia::HandleAuthToken(const HttpRequest& request, if (!GetQueryParameter(request.content, "code", &auth_code) || auth_code != merge_session_params_.auth_code) { http_response->set_code(net::HTTP_BAD_REQUEST); - LOG(ERROR) << "No 'code' param in /o/oauth2/token"; + LOG(ERROR) << "No 'code' param in /oauth2/v4/token"; return; } @@ -683,7 +683,7 @@ void FakeGaia::HandleAuthToken(const HttpRequest& request, } } - LOG(ERROR) << "Bad request for /o/oauth2/token - " + LOG(ERROR) << "Bad request for /oauth2/v4/token - " << "refresh_token = " << refresh_token << ", scope = " << scope << ", client_id = " << client_id; diff --git a/google_apis/gaia/fake_gaia.h b/google_apis/gaia/fake_gaia.h index 1f1a3ef..f84e2e7 100644 --- a/google_apis/gaia/fake_gaia.h +++ b/google_apis/gaia/fake_gaia.h @@ -64,7 +64,7 @@ class FakeGaia { // auth_code cookie value response for /o/oauth2/programmatic_auth call. std::string auth_code; - // OAuth2 refresh and access token generated by /o/oauth2/token call + // OAuth2 refresh and access token generated by /oauth2/v4/token call // with "...&grant_type=authorization_code". std::string refresh_token; std::string access_token; diff --git a/google_apis/gaia/gaia_urls.cc b/google_apis/gaia/gaia_urls.cc index d26a73b..0d1619e 100644 --- a/google_apis/gaia/gaia_urls.cc +++ b/google_apis/gaia/gaia_urls.cc @@ -41,10 +41,10 @@ const char kGetOAuthTokenUrlSuffix[] = "o/oauth/GetOAuthToken/"; const char kClientLoginToOAuth2UrlSuffix[] = "o/oauth2/programmatic_auth"; const char kOAuth2AuthUrlSuffix[] = "o/oauth2/auth"; const char kOAuth2RevokeUrlSuffix[] = "o/oauth2/revoke"; -const char kOAuth2TokenUrlSuffix[] = "o/oauth2/token"; const char kOAuth2IFrameUrlSuffix[] = "o/oauth2/iframerpc"; // API calls from www.googleapis.com +const char kOAuth2TokenUrlSuffix[] = "oauth2/v4/token"; const char kOAuth2IssueTokenUrlSuffix[] = "oauth2/v2/IssueToken"; const char kOAuth2TokenInfoUrlSuffix[] = "oauth2/v2/tokeninfo"; const char kOAuthUserInfoUrlSuffix[] = "oauth2/v1/userinfo"; @@ -121,12 +121,12 @@ GaiaUrls::GaiaUrls() { client_login_to_oauth2_url_ = lso_origin_url_.Resolve(kClientLoginToOAuth2UrlSuffix); oauth2_auth_url_ = lso_origin_url_.Resolve(kOAuth2AuthUrlSuffix); - oauth2_token_url_ = lso_origin_url_.Resolve(kOAuth2TokenUrlSuffix); oauth2_revoke_url_ = lso_origin_url_.Resolve(kOAuth2RevokeUrlSuffix); oauth2_iframe_url_ = lso_origin_url_.Resolve(kOAuth2IFrameUrlSuffix); // URLs from www.googleapis.com. + oauth2_token_url_ = google_apis_origin_url_.Resolve(kOAuth2TokenUrlSuffix); oauth2_issue_token_url_ = google_apis_origin_url_.Resolve(kOAuth2IssueTokenUrlSuffix); oauth2_token_info_url_ = |