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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: google_apis/gaia/gaia_auth_fetcher_unittest.cc

Issue 14169010: Remove support for ClientOAuth from GaiaAuthFetcher. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 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_auth_fetcher.cc ('k') | google_apis/gaia/gaia_constants.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: google_apis/gaia/gaia_auth_fetcher_unittest.cc
diff --git a/google_apis/gaia/gaia_auth_fetcher_unittest.cc b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
index 47b6d15c54a818a3653a51455c6b652b9d112eaf..c9fa1ef11fa10535f2f94f10aaa58141c6310c4d 100644
--- a/google_apis/gaia/gaia_auth_fetcher_unittest.cc
+++ b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
@@ -57,29 +57,6 @@ static const char kClientOAuthValidResponse[] =
" }"
"}";
-static void ExpectCaptchaChallenge(const GoogleServiceAuthError& error) {
- // Make sure this is a captcha server challange.
- EXPECT_EQ(GoogleServiceAuthError::CAPTCHA_REQUIRED, error.state());
- EXPECT_EQ("challengetokenblob", error.captcha().token);
- EXPECT_EQ("http://www.audio.com/", error.captcha().audio_url.spec());
- EXPECT_EQ("http://www.image.com/", error.captcha().image_url.spec());
- EXPECT_EQ(640, error.captcha().image_width);
- EXPECT_EQ(480, error.captcha().image_height);
-}
-
-static void ExpectBadAuth(const GoogleServiceAuthError& error) {
- EXPECT_EQ(GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS, error.state());
-}
-
-static void ExpectTwoFactorChallenge(const GoogleServiceAuthError& error) {
- // Make sure this is a captcha server challange.
- EXPECT_EQ(GoogleServiceAuthError::TWO_FACTOR, error.state());
- EXPECT_EQ("challengetokenblob", error.second_factor().token);
- EXPECT_EQ("prompt_text", error.second_factor().prompt_text);
- EXPECT_EQ("alternate_text", error.second_factor().alternate_text);
- EXPECT_EQ(10, error.second_factor().field_length);
-}
-
} // namespace
MockFetcher::MockFetcher(bool success,
@@ -138,7 +115,6 @@ class GaiaAuthFetcherTest : public testing::Test {
uberauth_token_source_(base::StringPrintf(
"%s?source=&issueuberauth=1",
GaiaUrls::GetInstance()->oauth1_login_url().c_str())),
- client_oauth_source_(GaiaUrls::GetInstance()->client_oauth_url()),
oauth_login_gurl_(GaiaUrls::GetInstance()->oauth1_login_url()) {}
void RunParsingTest(const std::string& data,
@@ -187,7 +163,6 @@ class GaiaAuthFetcherTest : public testing::Test {
GURL token_auth_source_;
GURL merge_session_source_;
GURL uberauth_token_source_;
- GURL client_oauth_source_;
GURL oauth_login_gurl_;
TestingProfile profile_;
protected:
@@ -814,211 +789,6 @@ TEST_F(GaiaAuthFetcherTest, ParseClientLoginToOAuth2Response) {
}
}
-TEST_F(GaiaAuthFetcherTest, ClientOAuthSuccess) {
- MockURLFetcherFactory<MockFetcher> factory;
- factory.set_results(kClientOAuthValidResponse);
-
- MockGaiaConsumer consumer;
- EXPECT_CALL(consumer, OnClientOAuthSuccess(
- GaiaAuthConsumer::ClientOAuthResult("rt1", "at1", 3600))).Times(1);
-
- GaiaAuthFetcher auth(&consumer, "tests", profile_.GetRequestContext());
- std::vector<std::string> scopes;
- scopes.push_back(GaiaUrls::GetInstance()->oauth1_login_scope());
- scopes.push_back("https://some.other.scope.com");
- auth.StartClientOAuth("username", "password", scopes, std::string(), "en");
-
- std::string expected_text = base::StringPrintf(
- "{"
- "\"email\": \"username\","
- "\"password\": \"password\","
- "\"scopes\": [\"https://www.google.com/accounts/OAuthLogin\","
- " \"https://some.other.scope.com\"],"
- "\"oauth2_client_id\": \"%s\","
- "\"friendly_device_name\": \"tests\","
- "\"accepts_challenges\": [\"Captcha\", \"TwoStep\"],"
- "\"locale\": \"en\","
- "\"fallback\": { \"name\": \"GetOAuth2Token\" }"
- "}",
- google_apis::GetOAuth2ClientID(google_apis::CLIENT_MAIN).c_str());
-
- scoped_ptr<base::Value> actual(base::JSONReader::Read(auth.request_body_));
- scoped_ptr<base::Value> expected(base::JSONReader::Read(expected_text));
- EXPECT_TRUE(expected->Equals(actual.get()));
-}
-
-TEST_F(GaiaAuthFetcherTest, ClientOAuthWithQuote) {
- MockURLFetcherFactory<MockFetcher> factory;
- factory.set_results(kClientOAuthValidResponse);
-
- MockGaiaConsumer consumer;
- EXPECT_CALL(consumer, OnClientOAuthSuccess(
- GaiaAuthConsumer::ClientOAuthResult("rt1", "at1", 3600))).Times(1);
-
- GaiaAuthFetcher auth(&consumer, "te\"sts", profile_.GetRequestContext());
- std::vector<std::string> scopes;
- scopes.push_back("https://some.\"other.scope.com");
- auth.StartClientOAuth(
- "user\"name", "pass\"word", scopes, std::string(), "e\"n");
-
- std::string expected_text = base::StringPrintf(
- "{"
- "\"email\": \"user\\\"name\","
- "\"password\": \"pass\\\"word\","
- "\"scopes\": [\"https://some.\\\"other.scope.com\"],"
- "\"oauth2_client_id\": \"%s\","
- "\"friendly_device_name\": \"te\\\"sts\","
- "\"accepts_challenges\": [\"Captcha\", \"TwoStep\"],"
- "\"locale\": \"e\\\"n\","
- "\"fallback\": { \"name\": \"GetOAuth2Token\" }"
- "}",
- google_apis::GetOAuth2ClientID(google_apis::CLIENT_MAIN).c_str());
- scoped_ptr<base::Value> actual(base::JSONReader::Read(auth.request_body_));
- scoped_ptr<base::Value> expected(base::JSONReader::Read(expected_text));
- EXPECT_TRUE(expected->Equals(actual.get()));
-}
-
-TEST_F(GaiaAuthFetcherTest, ClientOAuthBadAuth) {
- MockURLFetcherFactory<MockFetcher> factory;
- factory.set_success(false);
- factory.set_results("{"
- " \"cause\" : \"BadAuthentication\","
- " \"fallback\" : {"
- " \"name\" : \"Terminating\","
- " \"url\" : \"https://www.terminating.com\""
- " }"
- "}");
-
- MockGaiaConsumer consumer;
- EXPECT_CALL(consumer, OnClientOAuthFailure(_))
- .WillOnce(Invoke(ExpectBadAuth));
-
- GaiaAuthFetcher auth(&consumer, "tests", profile_.GetRequestContext());
- std::vector<std::string> scopes;
- scopes.push_back(GaiaUrls::GetInstance()->oauth1_login_scope());
- auth.StartClientOAuth("username", "password", scopes, std::string(), "en");
-}
-
-TEST_F(GaiaAuthFetcherTest, ClientOAuthCaptchaChallenge) {
- MockURLFetcherFactory<MockFetcher> factory;
- factory.set_success(false);
- factory.set_results("{"
- " \"cause\" : \"NeedsAdditional\","
- " \"fallback\" : {"
- " \"name\" : \"Terminating\","
- " \"url\" : \"https://www.terminating.com\""
- " },"
- " \"challenge\" : {"
- " \"name\" : \"Captcha\","
- " \"image_url\" : \"http://www.image.com/\","
- " \"image_width\" : 640,"
- " \"image_height\" : 480,"
- " \"audio_url\" : \"http://www.audio.com/\","
- " \"challenge_token\" : \"challengetokenblob\""
- " }"
- "}");
-
- MockGaiaConsumer consumer;
- EXPECT_CALL(consumer, OnClientOAuthFailure(_))
- .WillOnce(Invoke(ExpectCaptchaChallenge));
-
- GaiaAuthFetcher auth(&consumer, "tests", profile_.GetRequestContext());
- std::vector<std::string> scopes;
- scopes.push_back(GaiaUrls::GetInstance()->oauth1_login_scope());
- auth.StartClientOAuth("username", "password", scopes, std::string(), "en");
-}
-
-TEST_F(GaiaAuthFetcherTest, ClientOAuthTwoFactorChallenge) {
- MockURLFetcherFactory<MockFetcher> factory;
- factory.set_success(false);
- factory.set_results("{"
- " \"cause\" : \"NeedsAdditional\","
- " \"fallback\" : {"
- " \"name\" : \"Terminating\","
- " \"url\" : \"https://www.terminating.com\""
- " },"
- " \"challenge\" : {"
- " \"name\" : \"TwoStep\","
- " \"prompt_text\" : \"prompt_text\","
- " \"alternate_text\" : \"alternate_text\","
- " \"challenge_token\" : \"challengetokenblob\","
- " \"field_length\" : 10"
- " }"
- "}");
-
- MockGaiaConsumer consumer;
- EXPECT_CALL(consumer, OnClientOAuthFailure(_))
- .WillOnce(Invoke(ExpectTwoFactorChallenge));
-
- GaiaAuthFetcher auth(&consumer, "tests", profile_.GetRequestContext());
- std::vector<std::string> scopes;
- scopes.push_back(GaiaUrls::GetInstance()->oauth1_login_scope());
- auth.StartClientOAuth("username", "password", scopes, std::string(), "en");
-}
-
-TEST_F(GaiaAuthFetcherTest, ClientOAuthChallengeSuccess) {
- MockURLFetcherFactory<MockFetcher> factory;
- factory.set_results(kClientOAuthValidResponse);
-
- MockGaiaConsumer consumer;
- EXPECT_CALL(consumer, OnClientOAuthSuccess(
- GaiaAuthConsumer::ClientOAuthResult("rt1", "at1", 3600))).Times(2);
-
- GaiaAuthFetcher auth1(&consumer, std::string(), profile_.GetRequestContext());
- auth1.StartClientOAuthChallengeResponse(GoogleServiceAuthError::TWO_FACTOR,
- "token", "mysolution");
-
- scoped_ptr<base::Value> actual1(base::JSONReader::Read(auth1.request_body_));
- scoped_ptr<base::Value> expected1(base::JSONReader::Read(
- "{"
- " \"challenge_reply\" : {"
- " \"name\" : \"TwoStep\","
- " \"challenge_token\" : \"token\","
- " \"otp\" : \"mysolution\""
- " }"
- "}"));
- EXPECT_TRUE(expected1->Equals(actual1.get()));
-
- GaiaAuthFetcher auth2(&consumer, "tests", profile_.GetRequestContext());
- auth2.StartClientOAuthChallengeResponse(
- GoogleServiceAuthError::CAPTCHA_REQUIRED, "token", "mysolution");
-
- scoped_ptr<base::Value> actual2(base::JSONReader::Read(auth2.request_body_));
- scoped_ptr<base::Value> expected2(base::JSONReader::Read(
- "{"
- " \"challenge_reply\" : {"
- " \"name\" : \"Captcha\","
- " \"challenge_token\" : \"token\","
- " \"solution\" : \"mysolution\""
- " }"
- "}"));
- EXPECT_TRUE(expected2->Equals(actual2.get()));
-}
-
-TEST_F(GaiaAuthFetcherTest, ClientOAuthChallengeQuote) {
- MockURLFetcherFactory<MockFetcher> factory;
- factory.set_results(kClientOAuthValidResponse);
-
- MockGaiaConsumer consumer;
- EXPECT_CALL(consumer, OnClientOAuthSuccess(
- GaiaAuthConsumer::ClientOAuthResult("rt1", "at1", 3600))).Times(1);
-
- GaiaAuthFetcher auth(&consumer, std::string(), profile_.GetRequestContext());
- auth.StartClientOAuthChallengeResponse(GoogleServiceAuthError::TWO_FACTOR,
- "to\"ken", "my\"solution");
-
- scoped_ptr<base::Value> actual(base::JSONReader::Read(auth.request_body_));
- scoped_ptr<base::Value> expected(base::JSONReader::Read(
- "{"
- " \"challenge_reply\" : {"
- " \"name\" : \"TwoStep\","
- " \"challenge_token\" : \"to\\\"ken\","
- " \"otp\" : \"my\\\"solution\""
- " }"
- "}"));
- EXPECT_TRUE(expected->Equals(actual.get()));
-}
-
TEST_F(GaiaAuthFetcherTest, StartOAuthLogin) {
// OAuthLogin returns the same as the ClientLogin endpoint, minus CAPTCHA
// responses.
« no previous file with comments | « google_apis/gaia/gaia_auth_fetcher.cc ('k') | google_apis/gaia/gaia_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698