Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add retry to SignInAnonymously to avoid network issues. #1515

Merged
merged 1 commit into from
Jan 11, 2024
Merged

Add retry to SignInAnonymously to avoid network issues. #1515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 34 additions & 30 deletions auth/integration_test/src/integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,19 @@ class FirebaseAuthTest : public FirebaseTest {
}
}

void SignInAnonymously() {
FLAKY_TEST_SECTION_BEGIN();
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
FLAKY_TEST_SECTION_END();
}

void SignInAnonymously_DEPRECATED() {
FLAKY_TEST_SECTION_BEGIN();
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
"SignInAnonymously_DEPRECATED");
FLAKY_TEST_SECTION_END();
}

bool initialized_;
firebase::auth::Auth* auth_;
};
Expand Down Expand Up @@ -375,16 +388,15 @@ TEST_F(FirebaseAuthTest, TestInitialization) {
TEST_F(FirebaseAuthTest, TestAnonymousSignin) {
// Test notification on SignIn().

WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
SignInAnonymously();
EXPECT_TRUE(auth_->current_user().is_valid());
EXPECT_TRUE(auth_->current_user().is_anonymous());
DeleteUser();
}

TEST_F(FirebaseAuthTest, TestAnonymousSignin_DEPRECATED) {
// Test notification on SignIn().
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
"SignInAnonymously_DEPRECATED");
SignInAnonymously_DEPRECATED();
EXPECT_NE(auth_->current_user_DEPRECATED(), nullptr);
if (auth_->current_user_DEPRECATED() != nullptr) {
EXPECT_TRUE(auth_->current_user_DEPRECATED()->is_anonymous());
Expand Down Expand Up @@ -476,7 +488,7 @@ TEST_F(FirebaseAuthTest, TestTokensAndAuthStateListeners) {
TestIdTokenListener token_listener;
auth_->AddAuthStateListener(&listener);
auth_->AddIdTokenListener(&token_listener);
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
SignInAnonymously();
// Get an initial token.
firebase::Future<std::string> token_future =
auth_->current_user().GetToken(false);
Expand Down Expand Up @@ -631,7 +643,7 @@ TEST_F(FirebaseAuthTest, TestEmailAndPasswordSignin_DEPRECATED) {
}

TEST_F(FirebaseAuthTest, TestCopyUser) {
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
SignInAnonymously();
EXPECT_TRUE(auth_->current_user().is_valid());
if (!auth_->current_user().is_valid()) return;

Expand Down Expand Up @@ -659,8 +671,7 @@ TEST_F(FirebaseAuthTest, TestCopyUser) {
}

TEST_F(FirebaseAuthTest, TestCopyUser_DEPRECATED) {
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
"SignInAnonymously_DEPRECATED");
SignInAnonymously_DEPRECATED();
EXPECT_NE(auth_->current_user_DEPRECATED(), nullptr);
if (auth_->current_user_DEPRECATED() == nullptr) return;

Expand Down Expand Up @@ -937,7 +948,7 @@ TEST_F(FirebaseAuthTest, TestUpdateEmailAndPassword_DEPRECATED) {
}

TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithEmailCredential) {
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
SignInAnonymously();
firebase::auth::User user = auth_->current_user();
EXPECT_TRUE(user.is_valid());
std::string email = GenerateEmailAddress();
Expand All @@ -947,7 +958,7 @@ TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithEmailCredential) {
WaitForCompletion(user.LinkWithCredential(credential), "LinkWithCredential");
WaitForCompletion(user.Unlink(credential.provider().c_str()), "Unlink");
SignOut();
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
SignInAnonymously();
user = auth_->current_user();
EXPECT_TRUE(user.is_valid());
std::string email1 = GenerateEmailAddress();
Expand All @@ -971,8 +982,7 @@ TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithEmailCredential) {
}

TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithEmailCredential_DEPRECATED) {
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
"SignInAnonymously_DEPRECATED");
SignInAnonymously_DEPRECATED();
ASSERT_NE(auth_->current_user_DEPRECATED(), nullptr);
firebase::auth::User* user = auth_->current_user_DEPRECATED();
std::string email = GenerateEmailAddress();
Expand All @@ -984,8 +994,7 @@ TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithEmailCredential_DEPRECATED) {
WaitForCompletion(user->Unlink_DEPRECATED(credential.provider().c_str()),
"Unlink");
SignOut();
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
"SignInAnonymously_DEPRECATED");
SignInAnonymously_DEPRECATED();
EXPECT_NE(auth_->current_user_DEPRECATED(), nullptr);
std::string email1 = GenerateEmailAddress();
firebase::auth::Credential credential1 =
Expand All @@ -1006,7 +1015,7 @@ TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithEmailCredential_DEPRECATED) {
}

TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithBadCredential) {
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
SignInAnonymously();
firebase::auth::User pre_link_user = auth_->current_user();
EXPECT_TRUE(pre_link_user.is_valid());
firebase::auth::Credential twitter_cred =
Expand All @@ -1023,8 +1032,7 @@ TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithBadCredential) {
}

TEST_F(FirebaseAuthTest, TestLinkAnonymousUserWithBadCredential_DEPRECATED) {
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
"SignInAnonymously_DEPRECATED");
SignInAnonymously_DEPRECATED();
ASSERT_NE(auth_->current_user_DEPRECATED(), nullptr);
firebase::auth::User* pre_link_user = auth_->current_user_DEPRECATED();
firebase::auth::Credential twitter_cred =
Expand Down Expand Up @@ -1150,7 +1158,7 @@ TEST_F(FirebaseAuthTest, TestCreateUserWithExistingEmailFails_DEPRECATED) {

TEST_F(FirebaseAuthTest, TestSignInWithBadCredentials) {
// Get an anonymous user first.
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
SignInAnonymously();
EXPECT_TRUE(auth_->current_user().is_valid());
// Hold on to the existing user, to make sure it is unchanged by bad signins.
firebase::auth::User existing_user = auth_->current_user();
Expand Down Expand Up @@ -1404,7 +1412,7 @@ TEST_F(FirebaseAuthTest, TestAuthPersistenceWithAnonymousSignin) {

FLAKY_TEST_SECTION_BEGIN();

WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
SignInAnonymously();
EXPECT_TRUE(auth_->current_user().is_valid());
EXPECT_TRUE(auth_->current_user().is_anonymous());
Terminate();
Expand Down Expand Up @@ -2108,7 +2116,7 @@ TEST_F(FirebaseAuthTest,
TEST_F(FirebaseAuthTest, TestSuccessfulLinkFederatedProviderNoScopes) {
SKIP_TEST_ON_DESKTOP;
TEST_REQUIRES_USER_INTERACTION;
WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
SignInAnonymously();
ASSERT_TRUE(auth_->current_user().is_valid());
const std::string provider_id =
firebase::auth::GoogleAuthProvider::kProviderId;
Expand All @@ -2125,8 +2133,7 @@ TEST_F(FirebaseAuthTest,
TestSuccessfulLinkFederatedProviderNoScopes_DEPRECATED) {
SKIP_TEST_ON_DESKTOP;
TEST_REQUIRES_USER_INTERACTION;
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
"SignInAnonymously_DEPRECATED");
SignInAnonymously_DEPRECATED();
ASSERT_NE(auth_->current_user_DEPRECATED(), nullptr);
const std::string provider_id =
firebase::auth::GoogleAuthProvider::kProviderId;
Expand All @@ -2144,7 +2151,7 @@ TEST_F(FirebaseAuthTest,
SKIP_TEST_ON_DESKTOP;
TEST_REQUIRES_USER_INTERACTION;

WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
SignInAnonymously();
ASSERT_TRUE(auth_->current_user().is_valid());
const std::string provider_id =
firebase::auth::GoogleAuthProvider::kProviderId;
Expand All @@ -2163,8 +2170,7 @@ TEST_F(
SKIP_TEST_ON_DESKTOP;
TEST_REQUIRES_USER_INTERACTION;

WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
"SignInAnonymously_DEPRECATED");
SignInAnonymously_DEPRECATED();
ASSERT_NE(auth_->current_user_DEPRECATED(), nullptr);
const std::string provider_id =
firebase::auth::GoogleAuthProvider::kProviderId;
Expand All @@ -2181,7 +2187,7 @@ TEST_F(FirebaseAuthTest, TestSuccessfulLinkFederatedProvider) {
SKIP_TEST_ON_DESKTOP;
TEST_REQUIRES_USER_INTERACTION;

WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
SignInAnonymously();
ASSERT_TRUE(auth_->current_user().is_valid());
const std::string provider_id =
firebase::auth::GoogleAuthProvider::kProviderId;
Expand All @@ -2200,8 +2206,7 @@ TEST_F(FirebaseAuthTest, TestSuccessfulLinkFederatedProvider_DEPRECATED) {
SKIP_TEST_ON_DESKTOP;
TEST_REQUIRES_USER_INTERACTION;

WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
"SignInAnonymously_DEPRECATED");
SignInAnonymously_DEPRECATED();
ASSERT_NE(auth_->current_user_DEPRECATED(), nullptr);
const std::string provider_id =
firebase::auth::GoogleAuthProvider::kProviderId;
Expand All @@ -2220,7 +2225,7 @@ TEST_F(FirebaseAuthTest, TestLinkFederatedProviderBadProviderIdFails) {
SKIP_TEST_ON_DESKTOP;
TEST_REQUIRES_USER_INTERACTION;

WaitForCompletion(auth_->SignInAnonymously(), "SignInAnonymously");
SignInAnonymously();
ASSERT_TRUE(auth_->current_user().is_valid());
firebase::auth::FederatedOAuthProviderData provider_data(
/*provider=*/"MadeUpProvider",
Expand All @@ -2239,8 +2244,7 @@ TEST_F(FirebaseAuthTest,
SKIP_TEST_ON_DESKTOP;
TEST_REQUIRES_USER_INTERACTION;

WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(),
"SignInAnonymously_DEPRECATED");
SignInAnonymously_DEPRECATED();
ASSERT_NE(auth_->current_user_DEPRECATED(), nullptr);
firebase::auth::FederatedOAuthProviderData provider_data(
/*provider=*/"MadeUpProvider",
Expand Down
Loading