Skip to content

Commit 1111617

Browse files
committed
Added initial handling of android error messages
1 parent 28644a6 commit 1111617

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

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

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
import com.google.firebase.auth.FirebaseUser;
3434
import com.google.firebase.auth.GetTokenResult;
3535
import com.google.firebase.auth.GoogleAuthProvider;
36+
import com.google.firebase.auth.FirebaseAuthException;
3637

3738
class FirestackAuthModule extends ReactContextBaseJavaModule {
3839
private final int NO_CURRENT_USER = 100;
@@ -588,19 +589,21 @@ public void noUserCallback(final Callback callback) {
588589
}
589590

590591
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);
597593
}
598594

599-
public void userExceptionCallback(Exception ex, final Callback onFail) {
595+
public void userExceptionCallback(Exception exp, final Callback onFail) {
600596
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+
}
604607

605608
onFail.invoke(error);
606609
}
@@ -636,3 +639,6 @@ private WritableMap getUserMap() {
636639
return userMap;
637640
}
638641
}
642+
n userMap;
643+
}
644+
}

0 commit comments

Comments
 (0)