added callbackNoUser helper and refactored functions to use it

Author: Salakar

android/src/main/java/io/fullstack/firestack/FirestackAuth.java

@@ -1,7 +1,6 @@
 
 package io.fullstack.firestack;
 
-import android.content.Context;
 import android.util.Log;
 
 import java.util.Map;
@@ -59,6 +58,23 @@ public String getName() {
     return TAG;
   }
 
+  /**
+   * Returns a no user error.
+   *
+   * @param callback JS callback
+   */
+  public void callbackNoUser(Callback callback, Boolean isError) {
+    WritableMap err = Arguments.createMap();
+    err.putInt("errorCode", NO_CURRENT_USER);
+    err.putString("errorMessage", "No current user");
+
+    if (isError) {
+      callback.invoke(err);
+    } else {
+      callback.invoke(null, err);
+    }
+  }
+
   @ReactMethod
   public void listenForAuth() {
     if (mAuthListener == null || mAuth == null) {
@@ -217,7 +233,8 @@ public void updateUserEmail(final String email, final Callback callback) {
     FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
 
     if (user != null) {
-      user.updateEmail(email)
+      user
+          .updateEmail(email)
           .addOnCompleteListener(new OnCompleteListener<Void>() {
             @Override
             public void onComplete(@NonNull Task<Void> task) {
@@ -235,10 +252,7 @@ public void onComplete(@NonNull Task<Void> task) {
             }
           });
     } else {
-      WritableMap err = Arguments.createMap();
-      err.putInt("errorCode", NO_CURRENT_USER);
-      err.putString("errorMessage", "No current user");
-      callback.invoke(err);
+      callbackNoUser(callback, true);
     }
   }
 
@@ -266,10 +280,7 @@ public void onComplete(@NonNull Task<Void> task) {
             }
           });
     } else {
-      WritableMap err = Arguments.createMap();
-      err.putInt("errorCode", NO_CURRENT_USER);
-      err.putString("errorMessage", "No current user");
-      callback.invoke(err);
+      callbackNoUser(callback, true);
     }
   }
 
@@ -299,7 +310,6 @@ public void onComplete(@NonNull Task<Void> task) {
   @ReactMethod
   public void deleteUser(final Callback callback) {
     FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();
-
     if (user != null) {
       user.delete()
           .addOnCompleteListener(new OnCompleteListener<Void>() {
@@ -321,10 +331,7 @@ public void onComplete(@NonNull Task<Void> task) {
             }
           });
     } else {
-      WritableMap err = Arguments.createMap();
-      err.putInt("errorCode", NO_CURRENT_USER);
-      err.putString("errorMessage", "No current user");
-      callback.invoke(err);
+      callbackNoUser(callback, true);
     }
   }
 
@@ -445,7 +452,7 @@ public void getCurrentUser(final Callback callback) {
 
     this.user = mAuth.getCurrentUser();
     if (this.user == null) {
-      noUserCallback(callback);
+      callbackNoUser(callback, false);
     } else {
       Log.d("USRC", this.user.getUid());
       userCallback(this.user, callback);
@@ -513,6 +520,7 @@ public void userCallback(FirebaseUser passedUser, final Callback callback) {
     this.user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
       @Override
       public void onComplete(@NonNull Task<GetTokenResult> task) {
+        // TODO - no task is successful check...
         WritableMap msgMap = Arguments.createMap();
         WritableMap userMap = getUserMap();
         if (FirestackAuthModule.this.user != null) {
@@ -548,6 +556,8 @@ public void anonymousUserCallback(FirebaseUser passedUser, final Callback callba
         .addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
           @Override
           public void onComplete(@NonNull Task<GetTokenResult> task) {
+            // TODO - no task is successful check...
+
             WritableMap msgMap = Arguments.createMap();
             WritableMap userMap = getUserMap();
 
@@ -570,17 +580,6 @@ public void onFailure(@NonNull Exception ex) {
     });
   }
 
-
-  public void noUserCallback(final Callback callback) {
-    WritableMap message = Arguments.createMap();
-
-    message.putString("errorMessage", "no_user");
-    message.putString("eventName", "no_user");
-    message.putBoolean("authenticated", false);
-
-    callback.invoke(null, message);
-  }
-
   public void userErrorCallback(Task task, final Callback onFail) {
     WritableMap error = Arguments.createMap();
     error.putInt("errorCode", task.getException().hashCode());