|
33 | 33 | import com.google.firebase.auth.FirebaseUser; |
34 | 34 | import com.google.firebase.auth.GetTokenResult; |
35 | 35 | import com.google.firebase.auth.GoogleAuthProvider; |
| 36 | +import com.google.firebase.auth.FirebaseAuthException; |
36 | 37 |
|
37 | 38 | class FirestackAuthModule extends ReactContextBaseJavaModule { |
38 | 39 | private final int NO_CURRENT_USER = 100; |
@@ -588,19 +589,21 @@ public void noUserCallback(final Callback callback) { |
588 | 589 | } |
589 | 590 |
|
590 | 591 | public void userErrorCallback(Task task, final Callback onFail) { |
591 | | - WritableMap error = Arguments.createMap(); |
592 | | - error.putInt("errorCode", task.getException().hashCode()); |
593 | | - error.putString("errorMessage", task.getException().getMessage()); |
594 | | - error.putString("allErrorMessage", task.getException().toString()); |
595 | | - |
596 | | - onFail.invoke(error); |
| 592 | + userExceptionCallback(task.getException(), onFail); |
597 | 593 | } |
598 | 594 |
|
599 | | - public void userExceptionCallback(Exception ex, final Callback onFail) { |
| 595 | + public void userExceptionCallback(Exception exp, final Callback onFail) { |
600 | 596 | WritableMap error = Arguments.createMap(); |
601 | | - error.putInt("errorCode", ex.hashCode()); |
602 | | - error.putString("errorMessage", ex.getMessage()); |
603 | | - error.putString("allErrorMessage", ex.toString()); |
| 597 | + error.putString("errorMessage", exp.getMessage()); |
| 598 | + error.putString("allErrorMessage", exp.toString()); |
| 599 | + |
| 600 | + try { |
| 601 | + throw exp; |
| 602 | + } catch (FirebaseAuthException ex) { |
| 603 | + error.putString("errorCode", ex.getErrorCode()); |
| 604 | + } catch (Exception ex) { |
| 605 | + Log.e(TAG, ex.getMessage()); |
| 606 | + } |
604 | 607 |
|
605 | 608 | onFail.invoke(error); |
606 | 609 | } |
@@ -636,3 +639,6 @@ private WritableMap getUserMap() { |
636 | 639 | return userMap; |
637 | 640 | } |
638 | 641 | } |
| 642 | +n userMap; |
| 643 | + } |
| 644 | +} |
0 commit comments