Implemented setAuthStateChanged for iOS and added getCurrentUser (iOS and Android) #54
Conversation
|
Hi, please let me know if you need anything, I made this because of the issues I had in #48. This pull request is in case you feel it's worth merging. |
|
Hi @JavierPAYTEF, thank you for the PR. The changes look good - just make some adjustments according to my inline comments. |
|
Hi @chemerisuk, thanks for the reply. No problem about the changes. Although this is the first time I do a PR so I'm not very familiar with the process. Where can I see your comments? |
| private void getCurrentUser(final CallbackContext callbackContext) { | ||
| FirebaseUser user = firebaseAuth.getCurrentUser(); | ||
| if (user == null) { | ||
| callbackContext.error("User is not authorized"); |
There was a problem hiding this comment.
Return null is user is not signed in
callbackContext.sendPluginResult(new PluginResult(PluginResult.Status.OK, (String)null))| @@ -209,6 +249,9 @@ - (CDVPluginResult*) createAuthResult:(FIRAuthDataResult*)result withError:(NSEr | |||
| } | |||
|
|
|||
| - (NSDictionary*)userToDictionary:(FIRUser *)user { | |||
| if (!user) { | |||
| return @{}; | |||
There was a problem hiding this comment.
Return null is user is not signed in
return nil;
| @@ -11,6 +17,17 @@ - (void)pluginInitialize { | |||
| } | |||
| } | |||
|
|
|||
| - (void)getCurrentUser:(CDVInvokedUrlCommand *)command { | |||
| FIRUser *user = [FIRAuth auth].currentUser; | |||
| if (user) { | |||
There was a problem hiding this comment.
Just return nil if user is not signed in - you don't need the if block, just leave lines 23 + 24
|
@JavierPAYTEF well done, merged! |
|
@JavierPAYTEF I did some refactoring too. Please let me know if v1.1.0 works for you. |
|
Nice! I'll test it better on monday and let you know if I see anything wrong. Thanks for the plugin |
|
Hi @chemerisuk I just realized of a small issue described here #22 @CordovaMethod
private void setAuthStateChanged(boolean disable, CallbackContext callbackContext) {
this.authStateCallback = disable ? null : callbackContext;
if (disable) {
firebaseAuth.removeAuthStateListener(this);
} else {
firebaseAuth.addAuthStateListener(this);
}
}To this: @CordovaMethod
private void setAuthStateChanged(boolean disable, CallbackContext callbackContext) {
if (this.authStateCallback != null) {
this.authStateCallback = null;
firebaseAuth.removeAuthStateListener(this);
}
if (!disable) {
this.authStateCallback = callbackContext;
firebaseAuth.addAuthStateListener(this);
}
}To be honest, I haven't tested what happens if you add the same listener multiple times, probably not something good. |
|
@JavierPAYTEF me too, but to be safe I agree with what you suggest. |
This implements the missing method setAuthStateChanged in the iOS version of the plugin.
It also adds the method getCurrentUser() to request the current user in the Firebase Auth instance.