Skip to content

Commit 48e2fcc

Browse files
BlooJeansBlooJeans
committed
Fix passedUser not being used, make it more clear what user is being used
1 parent d6dc2e6 commit 48e2fcc

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

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

+25-25
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
}
@@ -421,18 +421,18 @@ public void userCallback(FirebaseUser passedUser, final Callback onComplete) {
421421

422422
if (passedUser == null) {
423423
mAuth = FirebaseAuth.getInstance();
424-
final FirebaseUser user = mAuth.getCurrentUser();
424+
this.user = mAuth.getCurrentUser();
425425
} else {
426-
final FirebaseUser user = passedUser;
426+
this.user = passedUser;
427427
}
428428

429-
user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
429+
this.user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
430430
@Override
431431
public void onComplete(@NonNull Task<GetTokenResult> task) {
432432
WritableMap msgMap = Arguments.createMap();
433433
WritableMap userMap = Arguments.createMap();
434434

435-
if (user != null) {
435+
if (FirestackAuthModule.this.user != null) {
436436
final String token = task.getResult().getToken();
437437

438438
userMap.putString("token", token);
@@ -452,18 +452,18 @@ public void anonymousUserCallback(FirebaseUser passedUser, final Callback onComp
452452

453453
if (passedUser == null) {
454454
mAuth = FirebaseAuth.getInstance();
455-
final FirebaseUser user = mAuth.getCurrentUser();
455+
this.user = mAuth.getCurrentUser();
456456
} else {
457-
final FirebaseUser user = passedUser;
457+
this.user = passedUser;
458458
}
459459

460-
user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
460+
this.user.getToken(true).addOnCompleteListener(new OnCompleteListener<GetTokenResult>() {
461461
@Override
462462
public void onComplete(@NonNull Task<GetTokenResult> task) {
463463
WritableMap msgMap = Arguments.createMap();
464464
WritableMap userMap = Arguments.createMap();
465465

466-
if (user != null) {
466+
if (FirestackAuthModule.this.user != null) {
467467
final String token = task.getResult().getToken();
468468

469469
userMap.putString("token", token);

0 commit comments

Comments
 (0)