fixed userCallback and removed anonymousUserCallback - js now decides if user is anon

Author: Salakar

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

@@ -187,7 +187,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
             try {
               if (task.isSuccessful()) {
                 FirestackAuthModule.this.user = task.getResult().getUser();
-                anonymousUserCallback(FirestackAuthModule.this.user, callback);
+                userCallback(FirestackAuthModule.this.user, callback);
               } else {
                 userErrorCallback(task, callback);
               }
@@ -532,14 +532,10 @@ private void userCallback(FirebaseUser passedUser, final Callback callback) {
         public void onComplete(@NonNull Task<GetTokenResult> task) {
           try {
             if (task.isSuccessful()) {
-              WritableMap msgMap = Arguments.createMap();
               WritableMap userMap = getUserMap();
               final String token = task.getResult().getToken();
-              // todo clean this up - standardise it
               userMap.putString("token", token);
-              userMap.putBoolean("anonymous", false);
-              msgMap.putMap("user", userMap);
-              callback.invoke(null, msgMap);
+              callback.invoke(null, userMap);
             } else {
               userErrorCallback(task, callback);
             }
@@ -553,45 +549,6 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
     }
   }
 
-  // TODO: Reduce to one method
-  private void anonymousUserCallback(FirebaseUser passedUser, final Callback callback) {
-
-    if (passedUser == null) {
-      mAuth = FirebaseAuth.getInstance();
-      this.user = mAuth.getCurrentUser();
-    } else {
-      this.user = passedUser;
-    }
-
-    if (this.user != null) {
-      this.user
-          .getToken(true)
-          .addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
-            @Override
-            public void onComplete(@NonNull Task<GetTokenResult> task) {
-              try {
-                if (task.isSuccessful()) {
-                  WritableMap msgMap = Arguments.createMap();
-                  WritableMap userMap = getUserMap();
-                  final String token = task.getResult().getToken();
-                  // todo clean this up - standardise it
-                  userMap.putString("token", token);
-                  userMap.putBoolean("anonymous", true);
-                  msgMap.putMap("user", userMap);
-                  callback.invoke(null, msgMap);
-                } else {
-                  userErrorCallback(task, callback);
-                }
-              } catch (Exception ex) {
-                userExceptionCallback(ex, callback);
-              }
-            }
-          });
-    } else {
-      callbackNoUser(callback, true);
-    }
-  }
-
   private void userErrorCallback(Task task, final Callback onFail) {
     WritableMap error = Arguments.createMap();
     error.putInt("errorCode", task.getException().hashCode());

lib/modules/user.js

@@ -92,6 +92,7 @@ export default class User {
     return this._auth.deleteUser(...args);
   }
 
+  // TODO valueOrNul token - optional promise
   getToken(...args) {
     return this._auth.getToken(...args);
   }