Added verification for fail to sign in when account is disabled by th… (firebase#1632)

Author: felipe-gouveia

app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

@@ -351,6 +351,11 @@ private void handleSignInResponse(int resultCode, @Nullable Intent data) {
                 startActivity(intent);
             }
 
+            if (response.getError().getErrorCode() == ErrorCodes.ERROR_USER_DISABLED) {
+                showSnackbar(R.string.account_disabled);
+                return;
+            }
+
             showSnackbar(R.string.unknown_error);
             Log.e(TAG, "Sign-in error: ", response.getError());
         }

app/src/main/res/values/strings.xml

@@ -78,6 +78,7 @@
 
     <string name="sign_in_cancelled">Sign in cancelled</string>
     <string name="no_internet_connection">No internet connection</string>
+    <string name="account_disabled">Account is disabled by the administrator</string>
     <string name="unknown_error">An unknown error occurred</string>
 
     <string name="title_anonymous_upgrade">FirebaseUI Anonymous Account Linking</string>

auth/src/main/java/com/firebase/ui/auth/ErrorCodes.java

@@ -66,6 +66,11 @@ public final class ErrorCodes {
      */
     public static final int EMAIL_LINK_DIFFERENT_ANONYMOUS_USER_ERROR = 11;
 
+    /**
+     *  Attempting to auth with account that is currently disabled in the Firebase console.
+     */
+    public static final int ERROR_USER_DISABLED = 12;
+
     private ErrorCodes() {
         throw new AssertionError("No instance for you!");
     }
@@ -100,6 +105,8 @@ public static String toFriendlyMessage(@Code int code) {
             case EMAIL_LINK_DIFFERENT_ANONYMOUS_USER_ERROR:
                 return "The session associated with this sign-in request has either expired or " +
                         "was cleared";
+            case ERROR_USER_DISABLED:
+                return "The user account has been disabled by an administrator.";
             default:
                 throw new IllegalArgumentException("Unknown code: " + code);
         }
@@ -120,7 +127,8 @@ public static String toFriendlyMessage(@Code int code) {
             EMAIL_LINK_WRONG_DEVICE_ERROR,
             EMAIL_LINK_PROMPT_FOR_EMAIL_ERROR,
             EMAIL_LINK_CROSS_DEVICE_LINKING_ERROR,
-            EMAIL_LINK_DIFFERENT_ANONYMOUS_USER_ERROR
+            EMAIL_LINK_DIFFERENT_ANONYMOUS_USER_ERROR,
+            ERROR_USER_DISABLED
     })
     @Retention(RetentionPolicy.SOURCE)
     public @interface Code {

auth/src/main/java/com/firebase/ui/auth/viewmodel/idp/SocialProviderResponseHandler.java

@@ -27,6 +27,7 @@
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.EmailAuthProvider;
+import com.google.firebase.auth.FirebaseAuthInvalidUserException;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
 
 import java.util.List;
@@ -108,6 +109,16 @@ public void onFailure(@NonNull Exception e) {
                                                     e));
                                         }
                                     });
+                        } else if (e instanceof FirebaseAuthInvalidUserException){
+                            setResult(Resource.<IdpResponse>forFailure(
+                                    new FirebaseUiException(
+                                            ErrorCodes.ERROR_USER_DISABLED,
+                                            ErrorCodes.toFriendlyMessage(
+                                                    ErrorCodes.ERROR_USER_DISABLED
+                                            )
+                                    )
+                            ));
+                            return;
                         }
                     }
                 });