Skip to content

Commit 9a05b23

Browse files
auserauser
authored
Merge pull request #95 from devshackio/fix-auth-user
Fix auth user and user map
2 parents 49ff5dd + eeeacc9 commit 9a05b23

File tree

3 files changed

+101
-110
lines changed

3 files changed

+101
-110
lines changed

‎android/build.gradle‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ android {
2020

2121
dependencies {
2222
compile 'com.facebook.react:react-native:0.20.+'
23-
compile 'com.google.android.gms:play-services-base:9.6.1'
23+
compile 'com.google.android.gms:play-services-base:9.8.0'
2424

25-
compile 'com.google.firebase:firebase-core:9.6.0'
26-
compile 'com.google.firebase:firebase-auth:9.6.0'
27-
compile 'com.google.firebase:firebase-analytics:9.6.0'
28-
compile 'com.google.firebase:firebase-database:9.6.0'
29-
compile 'com.google.firebase:firebase-storage:9.6.0'
30-
compile 'com.google.firebase:firebase-messaging:9.6.0'
25+
compile 'com.google.firebase:firebase-core:9.8.0'
26+
compile 'com.google.firebase:firebase-auth:9.8.0'
27+
compile 'com.google.firebase:firebase-analytics:9.8.0'
28+
compile 'com.google.firebase:firebase-database:9.8.0'
29+
compile 'com.google.firebase:firebase-storage:9.8.0'
30+
compile 'com.google.firebase:firebase-messaging:9.8.0'
3131
}
3232

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

Lines changed: 35 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void onAuthStateChanged(@NonNull FirebaseAuth firebaseAuth) {
6868
WritableMap msgMap = Arguments.createMap();
6969
msgMap.putString("eventName", "listenForAuth");
7070

71-
if (user != null) {
71+
if (FirestackAuthModule.this.user != null) {
7272
WritableMap userMap = getUserMap();
7373

7474
msgMap.putBoolean("authenticated", true);
@@ -107,8 +107,8 @@ public void createUserWithEmail(final String email, final String password, final
107107
@Override
108108
public void onComplete(@NonNull Task<AuthResult> task) {
109109
if (task.isSuccessful()) {
110-
user = task.getResult().getUser();
111-
userCallback(user, onComplete);
110+
FirestackAuthModule.this.user = task.getResult().getUser();
111+
userCallback(FirestackAuthModule.this.user, onComplete);
112112
}else{
113113
userErrorCallback(task, onComplete);
114114
}
@@ -125,8 +125,8 @@ public void signInWithEmail(final String email, final String password, final Cal
125125
@Override
126126
public void onComplete(@NonNull Task<AuthResult> task) {
127127
if (task.isSuccessful()) {
128-
user = task.getResult().getUser();
129-
userCallback(user, callback);
128+
FirestackAuthModule.this.user = task.getResult().getUser();
129+
userCallback(FirestackAuthModule.this.user, callback);
130130
} else {
131131
userErrorCallback(task, callback);
132132
}
@@ -156,8 +156,8 @@ public void onComplete(@NonNull Task<AuthResult> task) {
156156
Log.d(TAG, "signInAnonymously:onComplete:" + task.isSuccessful());
157157

158158
if (task.isSuccessful()) {
159-
user = task.getResult().getUser();
160-
anonymousUserCallback(user, callback);
159+
FirestackAuthModule.this.user = task.getResult().getUser();
160+
anonymousUserCallback(FirestackAuthModule.this.user, callback);
161161
}else{
162162
userErrorCallback(task, callback);
163163
}
@@ -176,8 +176,8 @@ public void signInWithCustomToken(final String customToken, final Callback callb
176176
public void onComplete(@NonNull Task<AuthResult> task) {
177177
Log.d(TAG, "signInWithCustomToken:onComplete:" + task.isSuccessful());
178178
if (task.isSuccessful()) {
179-
user = task.getResult().getUser();
180-
userCallback(user, callback);
179+
FirestackAuthModule.this.user = task.getResult().getUser();
180+
userCallback(FirestackAuthModule.this.user, callback);
181181
} else {
182182
userErrorCallback(task, callback);
183183
}
@@ -356,7 +356,7 @@ public void onComplete(@NonNull Task<Void> task) {
356356
@ReactMethod
357357
public void signOut(final Callback callback) {
358358
FirebaseAuth.getInstance().signOut();
359-
user = null;
359+
this.user = null;
360360

361361
WritableMap resp = Arguments.createMap();
362362
resp.putString("status", "complete");
@@ -368,11 +368,11 @@ public void signOut(final Callback callback) {
368368
public void getCurrentUser(final Callback callback) {
369369
mAuth = FirebaseAuth.getInstance();
370370

371-
user = mAuth.getCurrentUser();
372-
if(user == null){
371+
this.user = mAuth.getCurrentUser();
372+
if(this.user == null){
373373
noUserCallback(callback);
374374
}else{
375-
userCallback(user, callback);
375+
userCallback(this.user, callback);
376376
}
377377
}
378378

@@ -387,8 +387,8 @@ public void googleLogin(String IdToken, final Callback callback) {
387387
@Override
388388
public void onComplete(@NonNull Task<AuthResult> task) {
389389
if (task.isSuccessful()) {
390-
user = task.getResult().getUser();
391-
userCallback(user, callback);
390+
FirestackAuthModule.this.user = task.getResult().getUser();
391+
userCallback(FirestackAuthModule.this.user, callback);
392392
}else{
393393
userErrorCallback(task, callback);
394394
}
@@ -406,8 +406,8 @@ public void facebookLogin(String Token, final Callback callback) {
406406
@Override
407407
public void onComplete(@NonNull Task<AuthResult> task) {
408408
if (task.isSuccessful()) {
409-
user = task.getResult().getUser();
410-
userCallback(user, callback);
409+
FirestackAuthModule.this.user = task.getResult().getUser();
410+
userCallback(FirestackAuthModule.this.user, callback);
411411
}else{
412412
userErrorCallback(task, callback);
413413
}
@@ -417,26 +417,24 @@ public void onComplete(@NonNull Task<AuthResult> task) {
417417

418418
// Internal helpers
419419
public void userCallback(FirebaseUser passedUser, final Callback onComplete) {
420-
WritableMap userMap = getUserMap();
421420

422421
if (passedUser == null) {
423422
mAuth = FirebaseAuth.getInstance();
424-
final FirebaseUser user = mAuth.getCurrentUser();
423+
this.user = mAuth.getCurrentUser();
425424
} else {
426-
final FirebaseUser user = passedUser;
425+
this.user = passedUser;
427426
}
428427

429-
user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
428+
this.user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
430429
@Override
431430
public void onComplete(@NonNull Task<GetTokenResult> task) {
432-
WritableMap msgMap = Arguments.createMap();
433-
WritableMap userMap = Arguments.createMap();
434-
435-
if (user != null) {
436-
final String token = task.getResult().getToken();
431+
WritableMap msgMap = Arguments.createMap();
432+
WritableMap userMap = getUserMap();
433+
if (FirestackAuthModule.this.user != null) {
434+
final String token = task.getResult().getToken();
437435

438-
userMap.putString("token", token);
439-
userMap.putBoolean("anonymous", false);
436+
userMap.putString("token", token);
437+
userMap.putBoolean("anonymous", false);
440438
}
441439

442440
msgMap.putMap("user", userMap);
@@ -448,26 +446,25 @@ public void onComplete(@NonNull Task<GetTokenResult> task) {
448446

449447
// TODO: Reduce to one method
450448
public void anonymousUserCallback(FirebaseUser passedUser, final Callback onComplete) {
451-
WritableMap userMap = getUserMap();
452449

453450
if (passedUser == null) {
454451
mAuth = FirebaseAuth.getInstance();
455-
final FirebaseUser user = mAuth.getCurrentUser();
452+
this.user = mAuth.getCurrentUser();
456453
} else {
457-
final FirebaseUser user = passedUser;
454+
this.user = passedUser;
458455
}
459456

460-
user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
457+
this.user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
461458
@Override
462459
public void onComplete(@NonNull Task<GetTokenResult> task) {
463-
WritableMap msgMap = Arguments.createMap();
464-
WritableMap userMap = Arguments.createMap();
460+
WritableMap msgMap = Arguments.createMap();
461+
WritableMap userMap = getUserMap();
465462

466-
if (user != null) {
467-
final String token = task.getResult().getToken();
463+
if (FirestackAuthModule.this.user != null) {
464+
final String token = task.getResult().getToken();
468465

469-
userMap.putString("token", token);
470-
userMap.putBoolean("anonymous", true);
466+
userMap.putString("token", token);
467+
userMap.putBoolean("anonymous", true);
471468
}
472469

473470
msgMap.putMap("user", userMap);

0 commit comments

Comments
 (0)