Auth I/O '23 - update other SDK iTests to use new API

app_check/integration_test/src/integration_test.cc

@@ -491,13 +491,13 @@ void FirebaseAppCheckTest::CleanupFirestore(int expected_error = 0) {
 }
 
 void FirebaseAppCheckTest::SignIn() {
-  if (auth_->current_user_DEPRECATED() != nullptr) {
+  if (auth_->current_user().is_valid()) {
     // Already signed in.
     return;
   }
   LogDebug("Signing in.");
-  firebase::Future<firebase::auth::User*> sign_in_future =
-      auth_->SignInAnonymously_DEPRECATED();
+  firebase::Future<firebase::auth::AuthResult> sign_in_future =
+      auth_->SignInAnonymously();
   WaitForCompletion(sign_in_future, "SignInAnonymously");
   if (sign_in_future.error() != 0) {
     FAIL() << "Ensure your application has the Anonymous sign-in provider "
@@ -511,16 +511,15 @@ void FirebaseAppCheckTest::SignOut() {
     // Auth is not set up.
     return;
   }
-  if (auth_->current_user_DEPRECATED() == nullptr) {
+  if (!auth_->current_user().is_valid()) {
     // Already signed out.
     return;
   }
-  if (auth_->current_user_DEPRECATED()->is_anonymous()) {
+  if (auth_->current_user().is_anonymous()) {
     // If signed in anonymously, delete the anonymous user.
-    WaitForCompletion(auth_->current_user_DEPRECATED()->Delete(),
-                      "DeleteAnonymousUser");
+    WaitForCompletion(auth_->current_user().Delete(), "DeleteAnonymousUser");
     // If there was a problem deleting the user, try to sign out at least.
-    if (auth_->current_user_DEPRECATED()) {
+    if (auth_->current_user().is_valid()) {
       auth_->SignOut();
     }
   } else {
@@ -529,11 +528,11 @@ void FirebaseAppCheckTest::SignOut() {
     auth_->SignOut();
 
     // Wait for the sign-out to finish.
-    while (auth_->current_user_DEPRECATED() != nullptr) {
+    while (auth_->current_user().is_valid()) {
       if (ProcessEvents(100)) break;
     }
   }
-  EXPECT_EQ(auth_->current_user_DEPRECATED(), nullptr);
+  EXPECT_FALSE(auth_->current_user().is_valid());
 }
 
 firebase::database::DatabaseReference FirebaseAppCheckTest::CreateWorkingPath(
@@ -645,7 +644,7 @@ TEST_F(FirebaseAppCheckTest, TestSignIn) {
   InitializeAppCheckWithDebug();
   InitializeApp();
   InitializeAuth();
-  EXPECT_NE(auth_->current_user_DEPRECATED(), nullptr);
+  EXPECT_TRUE(auth_->current_user().is_valid());
 }
 
 TEST_F(FirebaseAppCheckTest, TestDebugProviderValidToken) {

auth/tests/auth_test.cc

@@ -124,7 +124,7 @@ class AuthTest : public ::testing::Test {
   void MakeAuth() {
     firebase_app_ = testing::CreateApp();
     firebase_auth_ = Auth::GetAuth(firebase_app_);
-    if (firebase_auth_->current_user_DEPRECATED()) {
+    if (firebase_auth_->current_user().is_valid()) {
       firebase_auth_->SignOut();
     }
   }
@@ -510,16 +510,16 @@ TEST_F(AuthTest, TestCurrentUserAndSignOut) {
   MakeAuth();
 
   // No user is signed in.
-  EXPECT_EQ(nullptr, firebase_auth_->current_user_DEPRECATED());
+  EXPECT_FALSE(firebase_auth_->current_user().is_valid());
 
   // Now sign-in, say anonymously.
   Future<User*> result = firebase_auth_->SignInAnonymously_DEPRECATED();
   MaybeWaitForFuture(result);
-  EXPECT_NE(nullptr, firebase_auth_->current_user_DEPRECATED());
+  EXPECT_TRUE(firebase_auth_->current_user().is_valid());
 
   // Now sign-out.
   firebase_auth_->SignOut();
-  EXPECT_EQ(nullptr, firebase_auth_->current_user_DEPRECATED());
+  EXPECT_FALSE(firebase_auth_->current_user().is_valid());
 }
 
 TEST_F(AuthTest, TestSendPasswordResetEmailSucceeded) {

database/integration_test/src/integration_test.cc

@@ -315,13 +315,13 @@ void FirebaseDatabaseTest::TerminateDatabase() {
 }
 
 void FirebaseDatabaseTest::SignIn() {
-  if (shared_auth_->current_user_DEPRECATED() != nullptr) {
+  if (shared_auth_->current_user().is_valid()) {
     // Already signed in.
     return;
   }
   LogDebug("Signing in.");
-  firebase::Future<firebase::auth::User*> sign_in_future =
-      shared_auth_->SignInAnonymously_DEPRECATED();
+  firebase::Future<firebase::auth::AuthResult> sign_in_future =
+      shared_auth_->SignInAnonymously();
   WaitForCompletion(sign_in_future, "SignInAnonymously");
   if (sign_in_future.error() != 0) {
     FAIL() << "Ensure your application has the Anonymous sign-in provider "
@@ -335,25 +335,25 @@ void FirebaseDatabaseTest::SignOut() {
     // Auth is not set up.
     return;
   }
-  if (shared_auth_->current_user_DEPRECATED() == nullptr) {
+  if (!shared_auth_->current_user().is_valid()) {
     // Already signed out.
     return;
   }
-  if (shared_auth_->current_user_DEPRECATED()->is_anonymous()) {
+  if (shared_auth_->current_user().is_anonymous()) {
     // If signed in anonymously, delete the anonymous user.
-    WaitForCompletion(shared_auth_->current_user_DEPRECATED()->Delete(),
+    WaitForCompletion(shared_auth_->current_user().Delete(),
                       "DeleteAnonymousUser");
   } else {
     // If not signed in anonymously (e.g. if the tests were modified to sign in
     // as an actual user), just sign out normally.
     shared_auth_->SignOut();
 
     // Wait for the sign-out to finish.
-    while (shared_auth_->current_user_DEPRECATED() != nullptr) {
+    while (shared_auth_->current_user().is_valid()) {
       if (ProcessEvents(100)) break;
     }
   }
-  EXPECT_EQ(shared_auth_->current_user_DEPRECATED(), nullptr);
+  EXPECT_FALSE(shared_auth_->current_user().is_valid());
 }
 
 firebase::database::DatabaseReference FirebaseDatabaseTest::CreateWorkingPath(
@@ -371,7 +371,7 @@ TEST_F(FirebaseDatabaseTest, TestInitializeAndTerminate) {
 }
 
 TEST_F(FirebaseDatabaseTest, TestSignIn) {
-  EXPECT_NE(shared_auth_->current_user_DEPRECATED(), nullptr);
+  EXPECT_TRUE(shared_auth_->current_user().is_valid());
 }
 
 TEST_F(FirebaseDatabaseTest, TestCreateWorkingPath) {

firestore/integration_test/src/integration_test.cc

@@ -272,13 +272,13 @@ void FirebaseFirestoreBasicTest::TerminateFirestore() {
 }
 
 void FirebaseFirestoreBasicTest::SignIn() {
-  if (shared_auth_->current_user_DEPRECATED() != nullptr) {
+  if (shared_auth_->current_user().is_valid()) {
     // Already signed in.
     return;
   }
   LogDebug("Signing in.");
-  firebase::Future<firebase::auth::User*> sign_in_future =
-      shared_auth_->SignInAnonymously_DEPRECATED();
+  firebase::Future<firebase::auth::AuthResult> sign_in_future =
+      shared_auth_->SignInAnonymously();
   WaitForCompletion(sign_in_future, "SignInAnonymously");
   if (sign_in_future.error() != 0) {
     FAIL() << "Ensure your application has the Anonymous sign-in provider "
@@ -292,26 +292,26 @@ void FirebaseFirestoreBasicTest::SignOut() {
     // Auth is not set up.
     return;
   }
-  if (shared_auth_->current_user_DEPRECATED() == nullptr) {
+  if (!shared_auth_->current_user().is_valid()) {
     // Already signed out.
     return;
   }
 
-  if (shared_auth_->current_user_DEPRECATED()->is_anonymous()) {
+  if (shared_auth_->current_user().is_anonymous()) {
     // If signed in anonymously, delete the anonymous user.
-    WaitForCompletion(shared_auth_->current_user_DEPRECATED()->Delete(),
+    WaitForCompletion(shared_auth_->current_user().Delete(),
                       "DeleteAnonymousUser");
   } else {
     // If not signed in anonymously (e.g. if the tests were modified to sign in
     // as an actual user), just sign out normally.
     shared_auth_->SignOut();
 
     // Wait for the sign-out to finish.
-    while (shared_auth_->current_user_DEPRECATED() != nullptr) {
+    while (shared_auth_->current_user().is_valid()) {
       if (ProcessEvents(100)) break;
     }
   }
-  EXPECT_EQ(shared_auth_->current_user_DEPRECATED(), nullptr);
+  EXPECT_FALSE(shared_auth_->current_user().is_valid());
 }
 
 firebase::firestore::CollectionReference
@@ -345,7 +345,7 @@ TEST_F(FirebaseFirestoreBasicTest, TestInitializeAndTerminate) {
 }
 
 TEST_F(FirebaseFirestoreBasicTest, TestSignIn) {
-  EXPECT_NE(shared_auth_->current_user_DEPRECATED(), nullptr);
+  EXPECT_TRUE(shared_auth_->current_user().is_valid());
 }
 
 TEST_F(FirebaseFirestoreBasicTest, TestAppAndSettings) {

firestore/integration_test_internal/src/firestore_test.cc

@@ -1537,7 +1537,7 @@ TEST_F(FirestoreIntegrationTest, AuthWorks) {
   WriteDocument(doc, MapFieldValue{{"foo", FieldValue::Integer(42)}});
 
   // Signing in should trigger an AuthStateListener event.
-  auto signin = auth->SignInAnonymously_DEPRECATED();
+  auto signin = auth->SignInAnonymously();
   Stopwatch stopwatch;
   Await(signin);
   stopwatch.stop();

firestore/integration_test_internal/src/integration_test.cc

@@ -275,13 +275,13 @@ void FirebaseFirestoreBasicTest::TerminateFirestore() {
 }
 
 void FirebaseFirestoreBasicTest::SignIn() {
-  if (shared_auth_->current_user_DEPRECATED() != nullptr) {
+  if (shared_auth_->current_user().is_valid()) {
     // Already signed in.
     return;
   }
   LogDebug("Signing in.");
-  firebase::Future<firebase::auth::User*> sign_in_future =
-      shared_auth_->SignInAnonymously_DEPRECATED();
+  firebase::Future<firebase::auth::AuthResult> sign_in_future =
+      shared_auth_->SignInAnonymously();
   WaitForCompletion(sign_in_future, "SignInAnonymously");
   if (sign_in_future.error() != 0) {
     FAIL() << "Ensure your application has the Anonymous sign-in provider "
@@ -295,26 +295,26 @@ void FirebaseFirestoreBasicTest::SignOut() {
     // Auth is not set up.
     return;
   }
-  if (shared_auth_->current_user_DEPRECATED() == nullptr) {
+  if (!shared_auth_->current_user().is_valid()) {
     // Already signed out.
     return;
   }
 
-  if (shared_auth_->current_user_DEPRECATED()->is_anonymous()) {
+  if (shared_auth_->current_user().is_anonymous()) {
     // If signed in anonymously, delete the anonymous user.
-    WaitForCompletion(shared_auth_->current_user_DEPRECATED()->Delete(),
+    WaitForCompletion(shared_auth_->current_user().Delete(),
                       "DeleteAnonymousUser");
   } else {
     // If not signed in anonymously (e.g. if the tests were modified to sign in
     // as an actual user), just sign out normally.
     shared_auth_->SignOut();
 
     // Wait for the sign-out to finish.
-    while (shared_auth_->current_user_DEPRECATED() != nullptr) {
+    while (shared_auth_->current_user().is_valid()) {
       if (ProcessEvents(100)) break;
     }
   }
-  EXPECT_EQ(shared_auth_->current_user_DEPRECATED(), nullptr);
+  EXPECT_FALSE(shared_auth_->current_user().is_valid());
 }
 
 firebase::firestore::CollectionReference
@@ -349,7 +349,7 @@ TEST_F(FirebaseFirestoreBasicTest, TestInitializeAndTerminate) {
 
 TEST_F(FirebaseFirestoreBasicTest, TestSignIn) {
   SKIP_TEST_ON_QUICK_CHECK;
-  EXPECT_NE(shared_auth_->current_user_DEPRECATED(), nullptr);
+  EXPECT_TRUE(shared_auth_->current_user().is_valid());
 }
 
 TEST_F(FirebaseFirestoreBasicTest, TestAppAndSettings) {

functions/integration_test/src/integration_test.cc

@@ -184,8 +184,8 @@ void FirebaseFunctionsTest::Terminate() {
 
 void FirebaseFunctionsTest::SignIn() {
   LogDebug("Signing in.");
-  firebase::Future<firebase::auth::User*> sign_in_future =
-      auth_->SignInAnonymously_DEPRECATED();
+  firebase::Future<firebase::auth::AuthResult> sign_in_future =
+      auth_->SignInAnonymously();
   WaitForCompletion(sign_in_future, "SignInAnonymously");
   if (sign_in_future.error() != 0) {
     FAIL() << "Ensure your application has the Anonymous sign-in provider "
@@ -252,7 +252,7 @@ TEST_F(FirebaseFunctionsTest, TestInitializeAndTerminate) {
 
 TEST_F(FirebaseFunctionsTest, TestSignIn) {
   SignIn();
-  EXPECT_NE(auth_->current_user_DEPRECATED(), nullptr);
+  EXPECT_TRUE(auth_->current_user().is_valid());
 }
 
 TEST_F(FirebaseFunctionsTest, TestFunction) {

storage/integration_test/src/integration_test.cc

@@ -271,13 +271,13 @@ void FirebaseStorageTest::TerminateStorage() {
 }
 
 void FirebaseStorageTest::SignIn() {
-  if (shared_auth_->current_user_DEPRECATED() != nullptr) {
+  if (shared_auth_->current_user().is_valid()) {
     // Already signed in.
     return;
   }
   LogDebug("Signing in.");
-  firebase::Future<firebase::auth::User*> sign_in_future =
-      shared_auth_->SignInAnonymously_DEPRECATED();
+  firebase::Future<firebase::auth::AuthResult> sign_in_future =
+      shared_auth_->SignInAnonymously();
   WaitForCompletion(sign_in_future, "SignInAnonymously");
   if (sign_in_future.error() != 0) {
     FAIL() << "Ensure your application has the Anonymous sign-in provider "
@@ -291,25 +291,25 @@ void FirebaseStorageTest::SignOut() {
     // Auth is not set up.
     return;
   }
-  if (shared_auth_->current_user_DEPRECATED() == nullptr) {
+  if (!shared_auth_->current_user().is_valid()) {
     // Already signed out.
     return;
   }
-  if (shared_auth_->current_user_DEPRECATED()->is_anonymous()) {
+  if (shared_auth_->current_user().is_anonymous()) {
     // If signed in anonymously, delete the anonymous user.
-    WaitForCompletion(shared_auth_->current_user_DEPRECATED()->Delete(),
+    WaitForCompletion(shared_auth_->current_user().Delete(),
                       "DeleteAnonymousUser");
   } else {
     // If not signed in anonymously (e.g. if the tests were modified to sign in
     // as an actual user), just sign out normally.
     shared_auth_->SignOut();
 
     // Wait for the sign-out to finish.
-    while (shared_auth_->current_user_DEPRECATED() != nullptr) {
+    while (shared_auth_->current_user().is_valid()) {
       if (ProcessEvents(100)) break;
     }
   }
-  EXPECT_EQ(shared_auth_->current_user_DEPRECATED(), nullptr);
+  EXPECT_FALSE(shared_auth_->current_user().is_valid());
 }
 
 firebase::storage::StorageReference FirebaseStorageTest::CreateFolder() {
@@ -330,7 +330,7 @@ TEST_F(FirebaseStorageTest, TestInitializeAndTerminate) {
 }
 
 TEST_F(FirebaseStorageTest, TestSignIn) {
-  EXPECT_NE(shared_auth_->current_user_DEPRECATED(), nullptr);
+  EXPECT_TRUE(shared_auth_->current_user().is_valid());
 }
 
 TEST_F(FirebaseStorageTest, TestCreateWorkingFolder) {