Skip to content

Commit b545267

Browse files
committed
Updates
1 parent 226bce3 commit b545267

File tree

4 files changed

+53
-2
lines changed

4 files changed

+53
-2
lines changed

android/build.gradle

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ android {
99
targetSdkVersion 23
1010
versionCode 1
1111
versionName "1.0"
12+
multiDexEnabled true
1213
}
1314
buildTypes {
1415
release {
@@ -19,6 +20,8 @@ android {
1920

2021
dependencies {
2122
compile 'com.facebook.react:react-native:0.20.+'
23+
compile 'com.google.android.gms:play-services-base:9.6.1'
24+
2225
compile 'com.google.firebase:firebase-core:9.6.0'
2326
compile 'com.google.firebase:firebase-auth:9.6.0'
2427
compile 'com.google.firebase:firebase-analytics:9.6.0'

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

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
157157

158158
if (task.isSuccessful()) {
159159
user = task.getResult().getUser();
160-
userCallback(user, callback);
160+
anonymousUserCallback(user, callback);
161161
}else{
162162
userErrorCallback(task, callback);
163163
}
@@ -461,6 +461,53 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
461461
});
462462
}
463463

464+
// TODO: Reduce to one method
465+
public void anonymousUserCallback(FirebaseUser passedUser, final Callback onComplete) {
466+
WritableMap userMap = getUserMap();
467+
468+
if (passedUser == null) {
469+
mAuth = FirebaseAuth.getInstance();
470+
final FirebaseUser user = mAuth.getCurrentUser();
471+
} else {
472+
final FirebaseUser user = passedUser;
473+
}
474+
475+
user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
476+
@Override
477+
public void onComplete(@NonNull Task<GetTokenResult> task) {
478+
WritableMap msgMap = Arguments.createMap();
479+
WritableMap userMap = Arguments.createMap();
480+
481+
if (user != null) {
482+
final String name = user.getDisplayName();
483+
final String token = task.getResult().getToken();
484+
final String email = user.getEmail();
485+
final String uid = user.getUid();
486+
final String provider = user.getProviderId();
487+
final Uri photoUrl = user.getPhotoUrl();
488+
489+
userMap.putString("name", name);
490+
userMap.putString("token", token);
491+
userMap.putString("email", email);
492+
userMap.putString("uid", uid);
493+
userMap.putString("providerId", provider);
494+
userMap.putBoolean("anonymous", true);
495+
496+
if (photoUrl!=null) {
497+
userMap.putString("photoUrl",photoUrl.toString());
498+
}
499+
} else {
500+
userMap.putString("msg", "no user");
501+
}
502+
503+
msgMap.putMap("user", userMap);
504+
505+
onComplete.invoke(null, msgMap);
506+
}
507+
});
508+
}
509+
510+
464511
public void noUserCallback(final Callback callback) {
465512
WritableMap message = Arguments.createMap();
466513

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.content.Context;
44
import android.util.Log;
5+
import java.util.Map;
56
import android.support.annotation.NonNull;
67
import android.support.annotation.Nullable;
78

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public static <Any> Any castSnapshotValue(DataSnapshot snapshot) {
120120
data.putMap(child.getKey(), (WritableMap) castedChild);
121121
break;
122122
default:
123-
Log.w(TAG, "Invalid type: "+type);
123+
Log.w(TAG, "Invalid type: " + castedChild.getClass().getName());
124124
break;
125125
}
126126
}

0 commit comments

Comments
 (0)