Skip to content

Commit 6bd76c5

Browse files
committed
added missing tryCatch and task successful checks on userCallback - app will crash on no network activity or disabled user.
1 parent bd8d4b2 commit 6bd76c5

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

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

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -530,19 +530,23 @@ private void userCallback(FirebaseUser passedUser, final Callback callback) {
530530
this.user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
531531
@Override
532532
public void onComplete(@NonNull Task<GetTokenResult> task) {
533-
// TODO - no task is successful check...
534-
WritableMap msgMap = Arguments.createMap();
535-
WritableMap userMap = getUserMap();
536-
if (FirestackAuthModule.this.user != null) {
537-
final String token = task.getResult().getToken();
538-
539-
userMap.putString("token", token);
540-
userMap.putBoolean("anonymous", false);
533+
try {
534+
if (task.isSuccessful()) {
535+
WritableMap msgMap = Arguments.createMap();
536+
WritableMap userMap = getUserMap();
537+
if (FirestackAuthModule.this.user != null) {
538+
final String token = task.getResult().getToken();
539+
userMap.putString("token", token);
540+
userMap.putBoolean("anonymous", false);
541+
}
542+
msgMap.putMap("user", userMap);
543+
callback.invoke(null, msgMap);
544+
} else {
545+
userErrorCallback(task, callback);
546+
}
547+
} catch (Exception ex) {
548+
userExceptionCallback(ex, callback);
541549
}
542-
543-
msgMap.putMap("user", userMap);
544-
545-
callback.invoke(null, msgMap);
546550
}
547551
}).addOnFailureListener(new OnFailureListener() {
548552
@Override

0 commit comments

Comments
 (0)