Skip to content

Commit 8a486eb

Browse files
committed
added missing tryCatch and task successful checks on anonymousUserCallback - app will crash on no network activity or disabled user.
1 parent 7ee0d55 commit 8a486eb

File tree

1 file changed

+19
-11
lines changed

1 file changed

+19
-11
lines changed

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

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,7 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
535535
WritableMap msgMap = Arguments.createMap();
536536
WritableMap userMap = getUserMap();
537537
final String token = task.getResult().getToken();
538+
// todo clean this up - standardise it
538539
userMap.putString("token", token);
539540
userMap.putBoolean("anonymous", false);
540541
msgMap.putMap("user", userMap);
@@ -568,20 +569,27 @@ private void anonymousUserCallback(FirebaseUser passedUser, final Callback callb
568569
}
569570

570571
if (this.user != null) {
571-
this.user.getToken(true)
572+
this.user
573+
.getToken(true)
572574
.addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
573575
@Override
574576
public void onComplete(@NonNull Task<GetTokenResult> task) {
575-
// TODO - no task is successful check...
576-
577-
WritableMap msgMap = Arguments.createMap();
578-
WritableMap userMap = getUserMap();
579-
final String token = task.getResult().getToken();
580-
userMap.putString("token", token);
581-
userMap.putBoolean("anonymous", true);
582-
msgMap.putMap("user", userMap);
583-
584-
callback.invoke(null, msgMap);
577+
try {
578+
if (task.isSuccessful()) {
579+
WritableMap msgMap = Arguments.createMap();
580+
WritableMap userMap = getUserMap();
581+
final String token = task.getResult().getToken();
582+
// todo clean this up - standardise it
583+
userMap.putString("token", token);
584+
userMap.putBoolean("anonymous", true);
585+
msgMap.putMap("user", userMap);
586+
callback.invoke(null, msgMap);
587+
} else {
588+
userErrorCallback(task, callback);
589+
}
590+
} catch (Exception ex) {
591+
userExceptionCallback(ex, callback);
592+
}
585593
}
586594
});
587595
} else {

0 commit comments

Comments
 (0)