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

Auth rewrite #1254

Draft
wants to merge 15 commits into
base: main
Choose a base branch
from
Draft

Auth rewrite #1254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3b736ad
initial Auth deprecations
DellaBitta Mar 10, 2023
86cc5bd
all three platforms build
DellaBitta Mar 10, 2023
e7ad4aa
FirebaseAuth.java and auth_test.cc fixes
DellaBitta Mar 12, 2023
16ec678
format
DellaBitta Mar 12, 2023
323d41d
bundle identifer
DellaBitta Mar 13, 2023
b247244
removed explicit from CurrentUserBlockListener constructor
DellaBitta Mar 13, 2023
c208b23
iOS support for multiple User objects (#1242)
DellaBitta Mar 19, 2023
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
78a0702
removed env from SetUserImpl
DellaBitta Mar 27, 2023
0fd6f7b
Android Auth Google I/O rework (#1245)
DellaBitta Mar 27, 2023
116923a
merge from feature branch
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
18 changes: 9 additions & 9 deletions app_check/integration_test/src/integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,13 +391,13 @@ void FirebaseAppCheckTest::TerminateFunctions() {
}

void FirebaseAppCheckTest::SignIn() {
if (auth_->current_user() != nullptr) {
if (auth_->current_user_DEPRECATED() != nullptr) {
// Already signed in.
return;
}
LogDebug("Signing in.");
firebase::Future<firebase::auth::User*> sign_in_future =
auth_->SignInAnonymously();
auth_->SignInAnonymously_DEPRECATED();
WaitForCompletion(sign_in_future, "SignInAnonymously");
if (sign_in_future.error() != 0) {
FAIL() << "Ensure your application has the Anonymous sign-in provider "
Expand All @@ -411,15 +411,15 @@ void FirebaseAppCheckTest::SignOut() {
// Auth is not set up.
return;
}
if (auth_->current_user() == nullptr) {
if (auth_->current_user_DEPRECATED() == nullptr) {
// Already signed out.
return;
}
if (auth_->current_user()->is_anonymous()) {
if (auth_->current_user_DEPRECATED()->is_anonymous()) {
// If signed in anonymously, delete the anonymous user.
WaitForCompletion(auth_->current_user()->Delete(), "DeleteAnonymousUser");
WaitForCompletion(auth_->current_user_DEPRECATED()->Delete(), "DeleteAnonymousUser");
// If there was a problem deleting the user, try to sign out at least.
if (auth_->current_user()) {
if (auth_->current_user_DEPRECATED()) {
auth_->SignOut();
}
} else {
Expand All @@ -428,11 +428,11 @@ void FirebaseAppCheckTest::SignOut() {
auth_->SignOut();

// Wait for the sign-out to finish.
while (auth_->current_user() != nullptr) {
while (auth_->current_user_DEPRECATED() != nullptr) {
if (ProcessEvents(100)) break;
}
}
EXPECT_EQ(auth_->current_user(), nullptr);
EXPECT_EQ(auth_->current_user_DEPRECATED(), nullptr);
}

firebase::database::DatabaseReference FirebaseAppCheckTest::CreateWorkingPath(
Expand Down Expand Up @@ -544,7 +544,7 @@ TEST_F(FirebaseAppCheckTest, TestSignIn) {
InitializeAppCheckWithDebug();
InitializeApp();
InitializeAuth();
EXPECT_NE(auth_->current_user(), nullptr);
EXPECT_NE(auth_->current_user_DEPRECATED(), nullptr);
}

TEST_F(FirebaseAppCheckTest, TestDebugProviderValidToken) {
Expand Down
422 changes: 240 additions & 182 deletions auth/integration_test/src/integration_test.cc
View file
Open in desktop

Large diffs are not rendered by default.

75 changes: 39 additions & 36 deletions auth/samples/src/doc_samples.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void VariousSignIns(firebase::auth::Auth* auth) {
{
// [START auth_create_user]
firebase::Future<firebase::auth::User*> result =
auth->CreateUserWithEmailAndPassword(email, password);
auth->CreateUserWithEmailAndPassword_DEPRECATED(email, password);
// [END auth_create_user]
(void)result;
}
Expand All @@ -129,14 +129,14 @@ void VariousSignIns(firebase::auth::Auth* auth) {
firebase::auth::OAuthProvider::GetCredential(
"apple.com", apple_id_token, raw_nonce, nullptr);
firebase::Future<firebase::auth::User*> result =
auth->SignInWithCredential(credential);
auth->SignInWithCredential_DEPRECATED(credential);
// [END auth_sign_in_apple]
(void)result;
}
{
// [START auth_sign_in_email]
firebase::Future<firebase::auth::User*> result =
auth->SignInWithEmailAndPassword(email, password);
auth->SignInWithEmailAndPassword_DEPRECATED(email, password);
// [END auth_sign_in_email]
(void)result;
}
Expand All @@ -146,7 +146,7 @@ void VariousSignIns(firebase::auth::Auth* auth) {
firebase::auth::GoogleAuthProvider::GetCredential(google_id_token,
nullptr);
firebase::Future<firebase::auth::User*> result =
auth->SignInWithCredential(credential);
auth->SignInWithCredential_DEPRECATED(credential);
// [END auth_sign_in_google]
(void)result;
}
Expand All @@ -156,7 +156,7 @@ void VariousSignIns(firebase::auth::Auth* auth) {
firebase::auth::PlayGamesAuthProvider::GetCredential(server_auth_code);

firebase::Future<firebase::auth::User*> result =
auth->SignInWithCredential(credential);
auth->SignInWithCredential_DEPRECATED(credential);
// [END auth_sign_in_play_games]
(void)result;
}
Expand All @@ -165,7 +165,7 @@ void VariousSignIns(firebase::auth::Auth* auth) {
firebase::auth::Credential credential =
firebase::auth::FacebookAuthProvider::GetCredential(access_token);
firebase::Future<firebase::auth::User*> result =
auth->SignInWithCredential(credential);
auth->SignInWithCredential_DEPRECATED(credential);
// [END auth_sign_in_facebook]
(void)result;
}
Expand All @@ -174,7 +174,7 @@ void VariousSignIns(firebase::auth::Auth* auth) {
firebase::auth::Credential credential =
firebase::auth::GitHubAuthProvider::GetCredential(token);
firebase::Future<firebase::auth::User*> result =
auth->SignInWithCredential(credential);
auth->SignInWithCredential_DEPRECATED(credential);
// [END auth_sign_in_github]
(void)result;
}
Expand All @@ -183,20 +183,21 @@ void VariousSignIns(firebase::auth::Auth* auth) {
firebase::auth::Credential credential =
firebase::auth::TwitterAuthProvider::GetCredential(token, secret);
firebase::Future<firebase::auth::User*> result =
auth->SignInWithCredential(credential);
auth->SignInWithCredential_DEPRECATED(credential);
// [END auth_sign_in_twitter]
(void)result;
}
{
// [START auth_sign_in_custom_token]
firebase::Future<firebase::auth::User*> result =
auth->SignInWithCustomToken(custom_token);
auth->SignInWithCustomToken_DEPRECATED(custom_token);
// [END auth_sign_in_custom_token]
(void)result;
}
{
// [START auth_sign_in_anonymously]
firebase::Future<firebase::auth::User*> result = auth->SignInAnonymously();
firebase::Future<firebase::auth::User*> result =
auth->SignInAnonymously_DEPRECATED();
// [END auth_sign_in_anonymously]
(void)result;
}
Expand All @@ -220,7 +221,7 @@ void VariousSignInChecks(firebase::auth::Auth* auth) {
{
// [START auth_sign_in_email_check]
firebase::Future<firebase::auth::User*> result =
auth->SignInWithEmailAndPasswordLastResult();
auth->SignInWithEmailAndPasswordLastResult_DEPRECATED();
if (result.status() == firebase::kFutureStatusComplete) {
if (result.error() == firebase::auth::kAuthErrorNone) {
firebase::auth::User* user = *result.result();
Expand All @@ -234,7 +235,7 @@ void VariousSignInChecks(firebase::auth::Auth* auth) {
{
// [START auth_sign_in_credential_check]
firebase::Future<firebase::auth::User*> result =
auth->SignInWithCredentialLastResult();
auth->SignInWithCredentialLastResult_DEPRECATED();
if (result.status() == firebase::kFutureStatusComplete) {
if (result.error() == firebase::auth::kAuthErrorNone) {
firebase::auth::User* user = *result.result();
Expand Down Expand Up @@ -262,7 +263,7 @@ void VariousSignInChecks(firebase::auth::Auth* auth) {
{
// [START auth_sign_in_anonymously_check]
firebase::Future<firebase::auth::User*> result =
auth->SignInAnonymouslyLastResult();
auth->SignInAnonymouslyLastResult_DEPRECATED();
if (result.status() == firebase::kFutureStatusComplete) {
if (result.error() == firebase::auth::kAuthErrorNone) {
firebase::auth::User* user = *result.result();
Expand All @@ -279,7 +280,7 @@ void VariousSignInChecks(firebase::auth::Auth* auth) {
class MyAuthStateListener : public firebase::auth::AuthStateListener {
public:
void OnAuthStateChanged(firebase::auth::Auth* auth) override {
firebase::auth::User* user = auth->current_user();
firebase::auth::User* user = auth->current_user_DEPRECATED();
if (user != nullptr) {
// User is signed in
printf("OnAuthStateChanged: signed_in %s\n", user->uid().c_str());
Expand All @@ -303,7 +304,7 @@ void VariousUserManagementChecks(firebase::auth::Auth* auth) {
}
{
// [START auth_user_info_check]
firebase::auth::User* user = auth->current_user();
firebase::auth::User* user = auth->current_user_DEPRECATED();
if (user != nullptr) {
std::string name = user->display_name();
std::string email = user->email();
Expand All @@ -317,7 +318,7 @@ void VariousUserManagementChecks(firebase::auth::Auth* auth) {
}
{
// [START auth_user_profile_data_check]
firebase::auth::User* user = auth->current_user();
firebase::auth::User* user = auth->current_user_DEPRECATED();
if (user != nullptr) {
for (auto it = user->provider_data().begin();
it != user->provider_data().end(); ++it) {
Expand All @@ -338,7 +339,7 @@ void VariousUserManagementChecks(firebase::auth::Auth* auth) {
}
{
// [START auth_profile_edit_check]
firebase::auth::User* user = auth->current_user();
firebase::auth::User* user = auth->current_user_DEPRECATED();
if (user != nullptr) {
firebase::auth::User::UserProfile profile;
profile.display_name = "Jane Q. User";
Expand All @@ -356,7 +357,7 @@ void VariousUserManagementChecks(firebase::auth::Auth* auth) {
}
{
// [START auth_set_email_check]
firebase::auth::User* user = auth->current_user();
firebase::auth::User* user = auth->current_user_DEPRECATED();
if (user != nullptr) {
user->UpdateEmail("[email protected]")
.OnCompletion(
Expand All @@ -373,7 +374,7 @@ void VariousUserManagementChecks(firebase::auth::Auth* auth) {
}
{
// [START auth_user_verify_email_check]
firebase::auth::User* user = auth->current_user();
firebase::auth::User* user = auth->current_user_DEPRECATED();
if (user != nullptr) {
user->SendEmailVerification().OnCompletion(
[](const firebase::Future<void>& completed_future, void* user_data) {
Expand All @@ -388,7 +389,7 @@ void VariousUserManagementChecks(firebase::auth::Auth* auth) {
}
{
// [START auth_user_update_password_check]
firebase::auth::User* user = auth->current_user();
firebase::auth::User* user = auth->current_user_DEPRECATED();
std::string newPassword = "SOME-SECURE-PASSWORD";

if (user != nullptr) {
Expand Down Expand Up @@ -427,7 +428,7 @@ void VariousUserManagementChecks(firebase::auth::Auth* auth) {
}
{
// [START auth_user_delete_check]
firebase::auth::User* user = auth->current_user();
firebase::auth::User* user = auth->current_user_DEPRECATED();
if (user != nullptr) {
user->Delete().OnCompletion(
[](const firebase::Future<void>& completed_future, void* user_data) {
Expand All @@ -445,7 +446,7 @@ void VariousUserManagementChecks(firebase::auth::Auth* auth) {
}
{
// [START auth_user_reauthenticate_check]
firebase::auth::User* user = auth->current_user();
firebase::auth::User* user = auth->current_user_DEPRECATED();

// Get auth credentials from the user for re-authentication. The example
// below shows email and password credentials but there are multiple
Expand Down Expand Up @@ -530,26 +531,27 @@ void LinkCredential(const firebase::auth::Credential& credential,
firebase::auth::Auth* auth) {
// [START user_link]
// Link the new credential to the currently active user.
firebase::auth::User* current_user = auth->current_user();
firebase::auth::User* current_user = auth->current_user_DEPRECATED();
firebase::Future<firebase::auth::User*> result =
current_user->LinkWithCredential(credential);
current_user->LinkWithCredential_DEPRECATED(credential);
// [END user_link]
}

void UnLinkCredential(const char* providerId, firebase::auth::Auth* auth) {
// [START user_unlink]
// Unlink the sign-in provider from the currently active user.
firebase::auth::User* current_user = auth->current_user();
firebase::auth::User* current_user = auth->current_user_DEPRECATED();
firebase::Future<firebase::auth::User*> result =
current_user->Unlink(providerId);
current_user->Unlink_DEPRECATED(providerId);
// [END user_unlink]
}

void LinkCredentialFailAppleSignIn(const firebase::auth::Credential& credential,
firebase::auth::Auth* auth) {
// [START link_credential_apple_signin]
firebase::Future<firebase::auth::SignInResult> link_result =
auth->current_user()->LinkAndRetrieveDataWithCredential(credential);
auth->current_user_DEPRECATED()->LinkAndRetrieveDataWithCredential(
credential);

// To keep example simple, wait on the current thread until call completes.
while (link_result.status() == firebase::kFutureStatusPending) {
Expand All @@ -563,8 +565,9 @@ void LinkCredentialFailAppleSignIn(const firebase::auth::Credential& credential,
firebase::auth::kAuthErrorCredentialAlreadyInUse &&
link_result.result()->info.updated_credential.is_valid()) {
// Sign In with the new credential
firebase::Future<firebase::auth::User*> result = auth->SignInWithCredential(
link_result.result()->info.updated_credential);
firebase::Future<firebase::auth::User*> result =
auth->SignInWithCredential_DEPRECATED(
link_result.result()->info.updated_credential);
} else {
// Another link error occurred.
}
Expand All @@ -575,15 +578,15 @@ void MergeCredentials(const firebase::auth::Credential& credential,
firebase::auth::Auth* auth) {
// [START user_merge]
// Gather data for the currently signed in User.
firebase::auth::User* current_user = auth->current_user();
firebase::auth::User* current_user = auth->current_user_DEPRECATED();
std::string current_email = current_user->email();
std::string current_provider_id = current_user->provider_id();
std::string current_display_name = current_user->display_name();
std::string current_photo_url = current_user->photo_url();

// Sign in with the new credentials.
firebase::Future<firebase::auth::User*> result =
auth->SignInWithCredential(credential);
auth->SignInWithCredential_DEPRECATED(credential);

// To keep example simple, wait on the current thread until call completes.
while (result.status() == firebase::kFutureStatusPending) {
Expand All @@ -608,7 +611,7 @@ void MergeCredentials(const firebase::auth::Credential& credential,

void NextSteps(firebase::auth::Auth* auth) {
// [START next_steps]
firebase::auth::User* user = auth->current_user();
firebase::auth::User* user = auth->current_user_DEPRECATED();
if (user != nullptr) {
std::string name = user->display_name();
std::string email = user->email();
Expand All @@ -623,7 +626,7 @@ void NextSteps(firebase::auth::Auth* auth) {

void SendIdTokenToBackend(firebase::auth::Auth* auth) {
// [START send_id_token_to_backend]
firebase::auth::User* user = auth->current_user();
firebase::auth::User* user = auth->current_user_DEPRECATED();
if (user != nullptr) {
firebase::Future<std::string> idToken = user->GetToken(true);

Expand All @@ -640,7 +643,7 @@ firebase::auth::Auth* AuthOverview(firebase::App* app) {

// Request anonymous sign-in and wait until asynchronous call completes.
firebase::Future<firebase::auth::User*> sign_in_future =
auth->SignInAnonymously();
auth->SignInAnonymously_DEPRECATED();
while (sign_in_future.status() == firebase::kFutureStatusPending) {
Wait(100);
printf("Signing in...\n");
Expand Down Expand Up @@ -709,13 +712,13 @@ const char* DisplayIdentityProviders(const char* email,
bool SignIn(firebase::auth::Auth* auth) {
// Grab the result of the latest sign-in attempt.
firebase::Future<firebase::auth::User*> future =
auth->SignInAnonymouslyLastResult();
auth->SignInAnonymouslyLastResult_DEPRECATED();

// If we're in a state where we can try to sign in, do so.
if (future.status() == firebase::kFutureStatusInvalid ||
(future.status() == firebase::kFutureStatusComplete &&
future.error() != firebase::auth::kAuthErrorNone)) {
auth->SignInAnonymously();
auth->SignInAnonymously_DEPRECATED();
}

// We're signed in if the most recent result was successful.
Expand Down
Loading