Commit 869b4b86 authored by Vasilii Sukhanov's avatar Vasilii Sukhanov Committed by Commit Bot

Return kNotSignIn from BulkLeakCheck when the token request failed.

Bug: 1049177
Change-Id: I42c3fce0c89859199d82db053fd899a2ed464e02
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2115655
Commit-Queue: Vasilii Sukhanov <vasilii@chromium.org>
Reviewed-by: default avatarJan Wilken Dörrie <jdoerrie@chromium.org>
Cr-Commit-Position: refs/heads/master@{#752598}
parent 352154b4
......@@ -784,7 +784,7 @@ TEST_F(PasswordCheckDelegateTest, GetPasswordCheckStatusOther) {
GoogleServiceAuthError::InvalidGaiaCredentialsReason::
CREDENTIALS_REJECTED_BY_SERVER));
EXPECT_EQ(api::passwords_private::PASSWORD_CHECK_STATE_OTHER_ERROR,
EXPECT_EQ(api::passwords_private::PASSWORD_CHECK_STATE_SIGNED_OUT,
delegate().GetPasswordCheckStatus().state);
}
......
......@@ -139,6 +139,8 @@ void BulkLeakCheckImpl::OnTokenReady(
if (error.state() != GoogleServiceAuthError::NONE) {
if (error.state() == GoogleServiceAuthError::CONNECTION_FAILED)
delegate_->OnError(LeakDetectionError::kNetworkError);
else if (error.state() == GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS)
delegate_->OnError(LeakDetectionError::kNotSignIn);
else
delegate_->OnError(LeakDetectionError::kTokenRequestFailure);
// |this| can be destroyed here.
......
......@@ -167,9 +167,7 @@ TEST_F(BulkLeakCheckTest, CheckCredentialsAccessTokenAuthError) {
credentials.push_back(TestCredential("user1"));
bulk_check().CheckCredentials(std::move(credentials));
identity_test_env().WaitForAccessTokenRequestIfNecessaryAndRespondWithError(
GoogleServiceAuthError::FromInvalidGaiaCredentialsReason(
GoogleServiceAuthError::InvalidGaiaCredentialsReason::
CREDENTIALS_REJECTED_BY_SERVER));
GoogleServiceAuthError::FromServiceError("error"));
}
TEST_F(BulkLeakCheckTest, CheckCredentialsAccessTokenNetError) {
......@@ -186,6 +184,22 @@ TEST_F(BulkLeakCheckTest, CheckCredentialsAccessTokenNetError) {
GoogleServiceAuthError::FromConnectionError(net::ERR_TIMED_OUT));
}
TEST_F(BulkLeakCheckTest, CheckCredentialsAccessTokenSignedOut) {
AccountInfo info = identity_test_env().MakeAccountAvailable(kTestEmail);
identity_test_env().SetCookieAccounts({{info.email, info.gaia}});
identity_test_env().SetRefreshTokenForAccount(info.account_id);
EXPECT_CALL(delegate(), OnError(LeakDetectionError::kNotSignIn));
std::vector<LeakCheckCredential> credentials;
credentials.push_back(TestCredential("user1"));
bulk_check().CheckCredentials(std::move(credentials));
identity_test_env().WaitForAccessTokenRequestIfNecessaryAndRespondWithError(
GoogleServiceAuthError::FromInvalidGaiaCredentialsReason(
GoogleServiceAuthError::InvalidGaiaCredentialsReason::
CREDENTIALS_REJECTED_BY_SERVER));
}
TEST_F(BulkLeakCheckTest, CheckCredentialsAccessDoesNetworkRequest) {
AccountInfo info = identity_test_env().MakeAccountAvailable(kTestEmail);
identity_test_env().SetCookieAccounts({{info.email, info.gaia}});
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment