Skip to content

Android Auth Google I/O rework #1245

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

Merged
merged 5 commits into from
Mar 27, 2023
Merged

Android Auth Google I/O rework #1245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3116021
Android compiles
DellaBitta Mar 23, 2023
166f0a7
Android builds and runs
DellaBitta Mar 24, 2023
ab8098b
Mutex locking on most user actions
DellaBitta Mar 26, 2023
093052b
standardized future creation and future impl naming
DellaBitta Mar 27, 2023
eac0334
moved error string to common implementation.
DellaBitta Mar 27, 2023
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
47 changes: 41 additions & 6 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 @@ -99,7 +99,7 @@ class FirebaseAuthTest : public FirebaseTest {
void SignOut();

// Delete the current user if it's currently signed in.
void DeleteUser();
void DeleteUser(firebase::auth::User* user = nullptr);

// Passthrough method to the base class's WaitForCompletion.
bool WaitForCompletion(firebase::Future<std::string> future, const char* fn,
Expand Down Expand Up @@ -261,11 +261,15 @@ void FirebaseAuthTest::SignOut() {
EXPECT_EQ(auth_->current_user_DEPRECATED(), nullptr);
}

void FirebaseAuthTest::DeleteUser() {
if (auth_ != nullptr && auth_->current_user_DEPRECATED() != nullptr) {
FirebaseTest::WaitForCompletion(auth_->current_user_DEPRECATED()->Delete(),
"Delete User");
ProcessEvents(100);
void FirebaseAuthTest::DeleteUser(firebase::auth::User* user) {
if (auth_ != nullptr) {
if (user == nullptr) {
user = auth_->current_user_DEPRECATED();
}
if (user != nullptr) {
FirebaseTest::WaitForCompletion(user->Delete(), "Delete User");
ProcessEvents(100);
}
}
}

Expand Down Expand Up @@ -454,6 +458,37 @@ TEST_F(FirebaseAuthTest, TestEmailAndPasswordSignin) {
EXPECT_EQ(auth_->current_user_DEPRECATED(), nullptr);
}

TEST_F(FirebaseAuthTest, TestRetainUser) {
WaitForCompletion(auth_->SignInAnonymously_DEPRECATED(), "SignInAnonymously");
ASSERT_NE(auth_->current_user_DEPRECATED(), nullptr);
firebase::auth::User anonymous_user = *auth_->current_user_DEPRECATED();
EXPECT_EQ(anonymous_user.is_anonymous(), true);
EXPECT_EQ(anonymous_user.email().size(), 0);

SignOut();

std::string email = GenerateEmailAddress();
// Register a random email and password. This signs us in as that user.
std::string password = kTestPassword;
firebase::Future<firebase::auth::User*> create_user_future =
auth_->CreateUserWithEmailAndPassword_DEPRECATED(email.c_str(),
password.c_str());
WaitForCompletion(create_user_future,
"CreateUserWithEmailAndPassword_DEPRECATED");
EXPECT_NE(auth_->current_user_DEPRECATED(), nullptr);
firebase::auth::User* email_user = auth_->current_user_DEPRECATED();

// Ensure the users are distinct objects.
EXPECT_EQ(anonymous_user.is_anonymous(), true);
EXPECT_EQ(email_user->is_anonymous(), false);

EXPECT_EQ(anonymous_user.email().size(), 0);
EXPECT_NE(email_user->email().size(), 0);

DeleteUser();
DeleteUser(&anonymous_user);
}

TEST_F(FirebaseAuthTest, TestUpdateUserProfile) {
std::string email = GenerateEmailAddress();
firebase::Future<firebase::auth::User*> create_user =
Expand Down
Loading