@@ -170,7 +170,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
170170
171171 if (task .isSuccessful ()) {
172172 FirestackAuthModule .this .user = task .getResult ().getUser ();
173- anonymousUserCallback (FirestackAuthModule .this .user , callback );
173+ userCallback (FirestackAuthModule .this .user , callback );
174174 } else {
175175 // userErrorCallback(task, callback);
176176 }
@@ -523,14 +523,15 @@ public void userCallback(FirebaseUser passedUser, final Callback callback) {
523523 public void onComplete (@ NonNull Task <GetTokenResult > task ) {
524524 WritableMap msgMap = Arguments .createMap ();
525525 WritableMap userMap = getUserMap ();
526+ boolean authenticated = false ;
526527 if (FirestackAuthModule .this .user != null ) {
527528 final String token = task .getResult ().getToken ();
528529 userMap .putString ("token" , token );
529- userMap . putBoolean ( "anonymous" , false ) ;
530+ authenticated = true ;
530531 }
531532
532533 msgMap .putMap ("user" , userMap );
533- msgMap .putBoolean ("authenticated" , true );
534+ msgMap .putBoolean ("authenticated" , authenticated );
534535 callback .invoke (null , msgMap );
535536 }
536537 }).addOnFailureListener (new OnFailureListener () {
@@ -541,43 +542,6 @@ public void onFailure(@NonNull Exception ex) {
541542 });
542543 }
543544
544- // TODO: Reduce to one method
545- public void anonymousUserCallback (FirebaseUser passedUser , final Callback callback ) {
546- 547- if (passedUser == null ) {
548- mAuth = FirebaseAuth .getInstance ();
549- this .user = mAuth .getCurrentUser ();
550- } else {
551- this .user = passedUser ;
552- }
553- 554- this .user .getToken (true )
555- .addOnCompleteListener (new OnCompleteListener <GetTokenResult >() {
556- @ Override
557- public void onComplete (@ NonNull Task <GetTokenResult > task ) {
558- WritableMap msgMap = Arguments .createMap ();
559- WritableMap userMap = getUserMap ();
560- 561- if (FirestackAuthModule .this .user != null ) {
562- final String token = task .getResult ().getToken ();
563- 564- userMap .putString ("token" , token );
565- userMap .putBoolean ("anonymous" , true );
566- }
567- 568- msgMap .putMap ("user" , userMap );
569- 570- callback .invoke (null , msgMap );
571- }
572- }).addOnFailureListener (new OnFailureListener () {
573- @ Override
574- public void onFailure (@ NonNull Exception ex ) {
575- userExceptionCallback (ex , callback );
576- }
577- });
578- }
579- 580- 581545 public void noUserCallback (final Callback callback ) {
582546 WritableMap message = Arguments .createMap ();
583547
@@ -624,7 +588,7 @@ private WritableMap getUserMap() {
624588 userMap .putString ("uid" , uid );
625589 userMap .putString ("providerId" , provider );
626590 userMap .putBoolean ("emailVerified" , user .isEmailVerified ());
627- 591+ userMap . putBoolean ( "anonymous" , user . isAnonymous ());
628592 if (name != null ) {
629593 userMap .putString ("displayName" , name );
630594 }
0 commit comments