Skip to content

Adding missing user info mapping to getUserMap (Android) #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 26, 2016
Merged

Adding missing user info mapping to getUserMap (Android) #85

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 17 additions & 35 deletions android/src/main/java/io/fullstack/firestack/FirestackAuth.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,25 +433,10 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
WritableMap userMap = Arguments.createMap();

if (user != null) {
final String name = user.getDisplayName();
final String token = task.getResult().getToken();
final String email = user.getEmail();
final String uid = user.getUid();
final String provider = user.getProviderId();
final Uri photoUrl = user.getPhotoUrl();

userMap.putString("name", name);
userMap.putString("token", token);
userMap.putString("email", email);
userMap.putString("uid", uid);
userMap.putString("providerId", provider);
userMap.putBoolean("anonymous", false);

if (photoUrl!=null) {
userMap.putString("photoUrl",photoUrl.toString());
}
} else {
userMap.putString("msg", "no user");
}

msgMap.putMap("user", userMap);
Expand Down Expand Up @@ -479,25 +464,10 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
WritableMap userMap = Arguments.createMap();

if (user != null) {
final String name = user.getDisplayName();
final String token = task.getResult().getToken();
final String email = user.getEmail();
final String uid = user.getUid();
final String provider = user.getProviderId();
final Uri photoUrl = user.getPhotoUrl();

userMap.putString("name", name);
userMap.putString("token", token);
userMap.putString("email", email);
userMap.putString("uid", uid);
userMap.putString("providerId", provider);
userMap.putBoolean("anonymous", true);

if (photoUrl!=null) {
userMap.putString("photoUrl",photoUrl.toString());
}
} else {
userMap.putString("msg", "no user");
}

msgMap.putMap("user", userMap);
Expand Down Expand Up @@ -533,15 +503,27 @@ private WritableMap getUserMap() {
FirebaseUser user = FirebaseAuth.getInstance().getCurrentUser();

if (user != null) {
userMap.putString("email", user.getEmail());
userMap.putString("uid", user.getUid());
userMap.putString("provider", user.getProviderId());
final String email = user.getEmail();
final String uid = user.getUid();
final String provider = user.getProviderId();
final String name = user.getDisplayName();
final Uri photoUrl = user.getPhotoUrl();

userMap.putString("email", email);
userMap.putString("uid", uid);
userMap.putString("providerId", provider);

if (name != null) {
userMap.putString("name", name);
}

if (photoUrl != null) {
userMap.putString("photoUrl", photoUrl.toString());
}
} else {
userMap.putString("msg", "no user");
}

return userMap;
}


}