feat(auth, android): add early return

firebase · Jul 19, 2022 · d6a62d6 · d6a62d6
1 parent c6ddc18
commit d6a62d6
Showing 1 changed file with 31 additions and 7 deletions.
diff --git a/...uth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthPlugin.java b/...uth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthPlugin.java
@@ -1698,11 +1698,11 @@ private void removeEventListeners() {
   // Map an id to a MultiFactorSession object.
   private final Map<String, MultiFactorResolver> multiFactorResolverMap = new HashMap<>();
 
-  private MultiFactor getAppMultiFactor(
-      @NonNull String appName, GeneratedAndroidFirebaseAuth.Result result) {
+  private MultiFactor getAppMultiFactor(@NonNull String appName)
+      throws FirebaseNoSignedInUserException {
     final FirebaseUser currentUser = getCurrentUser(appName);
     if (currentUser == null) {
-      result.error(new FirebaseNoSignedInUserException("No user is signed in"));
+      throw new FirebaseNoSignedInUserException("No user is signed in");
     }
     if (multiFactorUserMap.get(appName) == null) {
       multiFactorUserMap.put(appName, new HashMap<>());
@@ -1723,7 +1723,13 @@ public void enrollPhone(
       @NonNull GeneratedAndroidFirebaseAuth.PigeonPhoneMultiFactorAssertion assertion,
       @Nullable String displayName,
       GeneratedAndroidFirebaseAuth.Result<Void> result) {
-    final MultiFactor multiFactor = getAppMultiFactor(appName, result);
+    final MultiFactor multiFactor;
+    try {
+      multiFactor = getAppMultiFactor(appName);
+    } catch (FirebaseNoSignedInUserException e) {
+      result.error(e);
+      return;
+    }
 
     PhoneAuthCredential credential =
         PhoneAuthProvider.getCredential(
@@ -1748,7 +1754,13 @@ public void getSession(
       @NonNull String appName,
       GeneratedAndroidFirebaseAuth.Result<GeneratedAndroidFirebaseAuth.PigeonMultiFactorSession>
           result) {
-    final MultiFactor multiFactor = getAppMultiFactor(appName, result);
+    final MultiFactor multiFactor;
+    try {
+      multiFactor = getAppMultiFactor(appName);
+    } catch (FirebaseNoSignedInUserException e) {
+      result.error(e);
+      return;
+    }
 
     multiFactor
         .getSession()
@@ -1774,7 +1786,13 @@ public void unenroll(
       @NonNull String appName,
       @Nullable String factorUid,
       GeneratedAndroidFirebaseAuth.Result<Void> result) {
-    final MultiFactor multiFactor = getAppMultiFactor(appName, result);
+    final MultiFactor multiFactor;
+    try {
+      multiFactor = getAppMultiFactor(appName);
+    } catch (FirebaseNoSignedInUserException e) {
+      result.error(e);
+      return;
+    }
 
     multiFactor
         .unenroll(factorUid)
@@ -1793,7 +1811,13 @@ public void getEnrolledFactors(
       @NonNull String appName,
       GeneratedAndroidFirebaseAuth.Result<List<GeneratedAndroidFirebaseAuth.PigeonMultiFactorInfo>>
           result) {
-    final MultiFactor multiFactor = getAppMultiFactor(appName, result);
+    final MultiFactor multiFactor;
+    try {
+      multiFactor = getAppMultiFactor(appName);
+    } catch (FirebaseNoSignedInUserException e) {
+      result.error(e);
+      return;
+    }
 
     final List<MultiFactorInfo> factors = multiFactor.getEnrolledFactors();