refactor(authui): upgrade to Firebase Auth v20.0.0 (#1857)

Author: thatfiredev

auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneNumberVerificationHandler.java

@@ -9,6 +9,7 @@
 import com.firebase.ui.auth.viewmodel.AuthViewModelBase;
 import com.google.firebase.FirebaseException;
 import com.google.firebase.auth.PhoneAuthCredential;
+import com.google.firebase.auth.PhoneAuthOptions;
 import com.google.firebase.auth.PhoneAuthProvider;
 
 import java.util.concurrent.TimeUnit;
@@ -29,20 +30,19 @@ public PhoneNumberVerificationHandler(Application application) {
 
     public void verifyPhoneNumber(@NonNull Activity activity, final String number, boolean force) {
         setResult(Resource.<PhoneVerification>forLoading());
-        getPhoneAuth().verifyPhoneNumber(
-                number,
-                AUTO_RETRIEVAL_TIMEOUT_SECONDS,
-                TimeUnit.SECONDS,
-                activity,
-                new PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
+        PhoneAuthOptions.Builder optionsBuilder = PhoneAuthOptions.newBuilder(getAuth())
+                .setPhoneNumber(number)
+                .setTimeout(AUTO_RETRIEVAL_TIMEOUT_SECONDS, TimeUnit.SECONDS)
+                .setActivity(activity)
+                .setCallbacks(new PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
                     @Override
                     public void onVerificationCompleted(@NonNull PhoneAuthCredential credential) {
                         setResult(Resource.forSuccess(new PhoneVerification(
                                 number, credential, true)));
                     }
 
                     @Override
-                    public void onVerificationFailed(FirebaseException e) {
+                    public void onVerificationFailed(@NonNull FirebaseException e) {
                         setResult(Resource.<PhoneVerification>forFailure(e));
                     }
 
@@ -54,8 +54,11 @@ public void onCodeSent(@NonNull String verificationId,
                         setResult(Resource.<PhoneVerification>forFailure(
                                 new PhoneNumberVerificationRequiredException(number)));
                     }
-                },
-                force ? mForceResendingToken : null);
+                });
+        if (force) {
+            optionsBuilder.setForceResendingToken(mForceResendingToken);
+        }
+        PhoneAuthProvider.verifyPhoneNumber(optionsBuilder.build());
     }
 
     public void submitVerificationCode(String number, String code) {

auth/src/main/java/com/firebase/ui/auth/viewmodel/AuthViewModelBase.java

@@ -9,7 +9,6 @@
 import com.google.firebase.FirebaseApp;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
-import com.google.firebase.auth.PhoneAuthProvider;
 
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
@@ -19,7 +18,6 @@
 public abstract class AuthViewModelBase<T> extends OperableViewModel<FlowParameters, Resource<T>> {
     private CredentialsClient mCredentialsClient;
     private FirebaseAuth mAuth;
-    private PhoneAuthProvider mPhoneAuth;
 
     protected AuthViewModelBase(Application application) {
         super(application);
@@ -29,7 +27,6 @@ protected AuthViewModelBase(Application application) {
     protected void onCreate() {
         FirebaseApp app = FirebaseApp.getInstance(getArguments().appName);
         mAuth = FirebaseAuth.getInstance(app);
-        mPhoneAuth = PhoneAuthProvider.getInstance(mAuth);
         mCredentialsClient = GoogleApiUtils.getCredentialsClient(getApplication());
     }
 
@@ -42,22 +39,16 @@ protected FirebaseAuth getAuth() {
         return mAuth;
     }
 
-    protected PhoneAuthProvider getPhoneAuth() {
-        return mPhoneAuth;
-    }
-
     protected CredentialsClient getCredentialsClient() {
         return mCredentialsClient;
     }
 
     @VisibleForTesting
     public void initializeForTesting(FlowParameters parameters,
                                      FirebaseAuth auth,
-                                     CredentialsClient client,
-                                     PhoneAuthProvider phoneAuth) {
+                                     CredentialsClient client) {
         setArguments(parameters);
         mAuth = auth;
         mCredentialsClient = client;
-        mPhoneAuth = phoneAuth;
     }
 }

auth/src/test/java/com/firebase/ui/auth/viewmodel/EmailLinkSendEmailHandlerTest.java

@@ -62,7 +62,7 @@ public void setUp() {
         mHandler = new EmailLinkSendEmailHandler((Application) ApplicationProvider.getApplicationContext());
         FlowParameters testParams = TestHelper.getFlowParameters(new ArrayList<String>());
 
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
         mPersistenceManager = EmailLinkPersistenceManager.getInstance();
     }
 

auth/src/test/java/com/firebase/ui/auth/viewmodel/EmailLinkSignInHandlerTest.java

@@ -659,7 +659,7 @@ private void setupAnonymousUpgrade() {
                 EmailAuthProvider.PROVIDER_ID), /* enableAnonymousUpgrade */ true);
 
         testParams.emailLink = mHandler.getArguments().emailLink;
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
 
         // Mock isAnonymous() to return true so canUpgradeAnonymous will return true
         when(mMockAnonUser.isAnonymous()).thenReturn(true);
@@ -679,6 +679,6 @@ private void initializeHandlerWithSessionInfo(@Nullable String sessionId,
 
         testParams.emailLink = EMAIL_LINK + continueUrlBuilder.build();
 
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
     }
 }

auth/src/test/java/com/firebase/ui/auth/viewmodel/LinkingSocialProviderResponseHandlerTest.java

@@ -79,7 +79,7 @@ public void setUp() {
         mHandler = new LinkingSocialProviderResponseHandler((Application) ApplicationProvider.getApplicationContext());
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 GoogleAuthProvider.PROVIDER_ID));
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
     }
 
     @Test
@@ -279,7 +279,7 @@ public void testSignIn_genericIdpLinkingFlow_expectImmediateLink() {
     private void setupAnonymousUpgrade() {
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 GoogleAuthProvider.PROVIDER_ID), true);
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
         when(mMockAuth.getCurrentUser()).thenReturn(mMockUser);
         when(mMockUser.isAnonymous()).thenReturn(true);
         AuthOperationManager.getInstance().mScratchAuth = mScratchMockAuth;

auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java

@@ -62,7 +62,7 @@ public void setUp() {
         mHandler = new PhoneProviderResponseHandler((Application) ApplicationProvider.getApplicationContext());
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 PhoneAuthProvider.PROVIDER_ID));
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
     }
 
     @Test
@@ -138,7 +138,7 @@ public void testSignIn_autoUpgradeAnonymousEnabledWithExistingUser_expectMergeFa
     private void setupAnonymousUpgrade() {
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 PhoneAuthProvider.PROVIDER_ID), true);
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
         when(mMockAuth.getCurrentUser()).thenReturn(mMockUser);
         when(mMockUser.isAnonymous()).thenReturn(true);
     }

auth/src/test/java/com/firebase/ui/auth/viewmodel/RecoverPasswordHandlerTest.java

@@ -51,7 +51,7 @@ public void setUp() {
 
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 EmailAuthProvider.PROVIDER_ID));
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
 
         mPasswordResetSettings = ActionCodeSettings.newBuilder()
                 .setAndroidPackageName("com.firebase.uidemo", true, null)

auth/src/test/java/com/firebase/ui/auth/viewmodel/SmartLockHandlerTest.java

@@ -62,7 +62,7 @@ public void setUp() {
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 EmailAuthProvider.PROVIDER_ID));
 
-        mHandler.initializeForTesting(testParams, mMockAuth, mMockCredentials, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, mMockCredentials);
         mHandler.setResponse(new IdpResponse.Builder(
                 new User.Builder(EmailAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build()
         ).build());

auth/src/test/java/com/firebase/ui/auth/viewmodel/SocialProviderResponseHandlerTest.java

@@ -73,7 +73,7 @@ public void setUp() {
         mHandler = new SocialProviderResponseHandler((Application) ApplicationProvider.getApplicationContext());
         FlowParameters testParams = TestHelper.getFlowParameters(AuthUI.SUPPORTED_PROVIDERS);
 
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
     }
 
     @Test
@@ -334,7 +334,7 @@ private void setupAnonymousUpgrade() {
         // enableAnonymousUpgrade must be set to true
         FlowParameters testParams = TestHelper.getFlowParameters(AuthUI.SUPPORTED_PROVIDERS,
                 /* enableAnonymousUpgrade */ true);
-        mHandler.initializeForTesting(testParams, mMockAuth, null, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, null);
 
         when(mUser.isAnonymous()).thenReturn(true);
         when(mMockAuth.getCurrentUser()).thenReturn(mUser);

auth/src/test/java/com/firebase/ui/auth/viewmodel/WelcomeBackPasswordHandlerTest.java

@@ -68,7 +68,7 @@ public void setUp() {
 
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 EmailAuthProvider.PROVIDER_ID));
-        mHandler.initializeForTesting(testParams, mMockAuth, mMockCredentials, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, mMockCredentials);
     }
 
     @Test
@@ -230,7 +230,7 @@ private void setupAnonymousUpgrade() {
         // enableAnonymousUpgrade must be set to true
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(
                 EmailAuthProvider.PROVIDER_ID), /* enableAnonymousUpgrade */ true);
-        mHandler.initializeForTesting(testParams, mMockAuth, mMockCredentials, null);
+        mHandler.initializeForTesting(testParams, mMockAuth, mMockCredentials);
 
         // Mock isAnonymous() to return true so canUpgradeAnonymous will return true
         when(mUser.isAnonymous()).thenReturn(true);