Update ios implementation

Author: ReallySmallSoftware

src/ios/FirebaseUIAuthPlugin.m

@@ -119,7 +119,7 @@ - (void)getToken:(CDVInvokedUrlCommand *)command {
         } else {
             CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"no_user_found"];
 
-            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.signInCallbackId];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
         }
     }
     @catch (NSException *exception) {
@@ -135,18 +135,18 @@ - (void)getCurrentUser:(CDVInvokedUrlCommand *)command {
 
         if (user != nil) {
 
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsString:[self formatUser:user]];
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:[self formatUser:user]];
 
             [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 
         } else {
-            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+            CDVPluginResult *pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:[self formatEmptyUser]];
 
-            [self.commandDelegate sendPluginResult:pluginResult callbackId:self.signInCallbackId];
+            [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
         }
     }
     @catch (NSException *exception) {
-        NSLog(@"getToken error %@", [exception reason]);
+        NSLog(@"getCurrentUser error %@", [exception reason]);
         @throw exception;
     }
 }
@@ -254,6 +254,9 @@ - (BOOL)application:(UIApplication *)app
 - (void)signOut:(CDVInvokedUrlCommand *)command {
 
     @try {
+
+        self.signInCallbackId = command.callbackId;
+
         if ([self.authUI signOutWithError:nil]) {
             [self raiseEvent:@"signoutsuccess" withData:nil];
             [self signInAnonymous];
@@ -271,6 +274,8 @@ - (void)deleteUser:(CDVInvokedUrlCommand *)command {
 
     @try {
 
+        self.signInCallbackId = command.callbackId;
+
         FIRUser *user = [[FIRAuth auth] currentUser];
 
         [user deleteWithCompletion:^(NSError * _Nullable error) {
@@ -298,6 +303,8 @@ - (void)sendEmailVerification:(CDVInvokedUrlCommand *)command {
 
     @try {
 
+        self.signInCallbackId = command.callbackId;
+
         FIRUser *user = [[FIRAuth auth] currentUser];
 
         [user sendEmailVerificationWithCompletion:^(NSError * _Nullable error) {
@@ -319,6 +326,8 @@ - (void)reloadUser:(CDVInvokedUrlCommand *)command {
 
     @try {
 
+        self.signInCallbackId = command.callbackId;
+
         FIRUser *user = [[FIRAuth auth] currentUser];
 
         [user reloadWithCompletion:^(NSError * _Nullable error) {
@@ -347,20 +356,20 @@ - (NSDictionary *)formatUser:(FIRUser *)user {
     NSNumber *isEmailVerified;
 
     NSNumber *newUser;
-    
+
     self.anonymous = false;
-    
+
     if ([user isEmailVerified]) {
         isEmailVerified = @YES;
     } else {
         isEmailVerified = @NO;
     }
 
     FIRUserMetadata *metadata = [user metadata];
-    
+
     NSDate *lastSignInDate = [metadata lastSignInDate];
     NSDate *creationDate = [metadata creationDate];
-    
+
     if ([lastSignInDate compare:creationDate] == NSOrderedSame) {
         newUser = @YES;
     } else {
@@ -387,6 +396,20 @@ - (NSDictionary *)formatUser:(FIRUser *)user {
     return result;
 }
 
+- (NSDictionary *)formatEmptyUser {
+
+    NSDictionary *result;
+
+    result = @{@"email" : (id)[NSNull null],
+               @"emailVerified" : @NO,
+               @"name" : (id)[NSNull null],
+               @"id" : (id)[NSNull null],
+               @"newUser" : @NO
+               };
+
+    return result;
+}
+
 - (NSString *)emptyIfNull:(NSString *)value {
     if (value == nil) {
         return (id)[NSNull null];