Add reloadUser and sendEmailVerification

Author: ReallySmallSoftware

README.md

@@ -38,7 +38,6 @@ cordova plugin add cordova-plugin-firebaseui-auth --variable ANDROID_FIREBASE_CO
     --variable FACEBOOK_DISPLAY_NAME="My application"
     --variable REVERSED_CLIENT_ID="com.googleusercontent.apps.9999999999-xxxxxxxxxxxxxxxxxxxxxxxxxx"
     --variable COLOR_PRIMARY="#ffffff"
-    --variable COLOR_PRIMARY="#ffffff"
     --variable COLOR_DARK_PRIMARY="#555555"
     --variable COLOR_LIGHT_PRIMARY="#aaaaaa"
     --variable COLOR_ACCENT="#7C4DFF"
@@ -215,6 +214,26 @@ Sign out failed for some reason.
 ## getToken()
 Get an access token, returning a Promise.
 
+## deleteUser()
+
+### deleteusersuccess
+The user was deleted successfully.
+
+### deleteuserfailure
+The user was not deleted.
+
+## sendEmailVerification()
+Sends a verification email for the current user.
+
+### emailverificationsent
+The email verification was sent.
+
+### emailverificationnotsent
+The email verification was not sent.
+
+## reloadUser
+Reloads user details. Useful after a verification link has been used. A signinsuccess event will be raised.
+
 # What platform configuration is carried out?
 For iOS and Android a number of platform files are added or updated based on the supplied configuration.
 
@@ -292,6 +311,11 @@ In order to ensure the browser implementation works, it will be necessary to con
 ```
 
 # History
+## 0.0.9
+- Added missing documentation for deleteUser() method
+- Added sendEmailVerification() method
+- Added property newUser to user details. Only true when user us first created.
+
 ## 0.0.8
 - Update Android dependency versions
 - Update iOS dependency versions

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-firebaseui-auth",
-  "version": "0.0.8",
+  "version": "0.0.9",
   "description": "Adds support for Firebase UI authentication.",
   "repository": {
     "type": "git",

plugin.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-firebaseui-auth" version="0.0.8">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-firebaseui-auth" version="0.0.9">
   <name>Firebase UI Authentication</name>
   <description>Adds support for Firebase Authentication to your Cordova/PhoneGap apps.</description>
   <license>Apache 2.0</license>

src/android/uk/co/reallysmall/cordova/plugin/firebase/ui/auth/FirebaseUIAuthPlugin.java

@@ -8,6 +8,7 @@
 import com.firebase.ui.auth.AuthUI;
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
@@ -47,21 +48,63 @@ public boolean execute(String action, JSONArray args, CallbackContext callbackCo
         Log.d(TAG, "action : " + action);
 
         if ("initialise".equals(action)) {
-          return initialise(args, callbackContext);
+            return initialise(args, callbackContext);
         } else if ("signIn".equals(action)) {
-          return signIn(callbackContext);
+            return signIn(callbackContext);
         } else if ("signOut".equals(action)) {
-          return signOut(callbackContext);
+            return signOut(callbackContext);
         } else if ("deleteUser".equals(action)) {
-          return deleteUser(callbackContext);
+            return deleteUser(callbackContext);
         } else if ("getToken".equals(action)) {
-          return getToken(callbackContext);
+            return getToken(callbackContext);
+        } else if ("sendEmailVerification".equals(action)) {
+            return sendEmailVerification(callbackContext);
+        } else if ("reloadUser".equals(action)) {
+            return reloadUser(callbackContext);
         } else {
-          Log.w(TAG, "Unknown action : " + action);
-          return false;
+            Log.w(TAG, "Unknown action : " + action);
+            return false;
         }
     }
 
+    private boolean reloadUser(CallbackContext callbackContext) {
+        FirebaseUser user = firebaseAuth.getCurrentUser();
+
+        if (user != null) {
+            user.reload().addOnSuccessListener(new OnSuccessListener<Void>() {
+
+                @Override
+                public void onSuccess(Void aVoid) {
+                   FirebaseUser user = firebaseAuth.getCurrentUser();
+                   raiseEventForUser(user);
+                }
+             });
+        }
+
+        return true;
+    }
+
+    private boolean sendEmailVerification(final CallbackContext callbackContext) {
+
+        FirebaseUser user = firebaseAuth.getCurrentUser();
+
+        if (user != null && !anonymous) {
+
+            user.sendEmailVerification().addOnCompleteListener(new OnCompleteListener() {
+                @Override
+                public void onComplete(@NonNull Task task) {
+                    if (task.isSuccessful()) {
+                        raiseEvent(callbackContext, "emailverificationsent", null);
+                    } else {
+                        raiseEvent(callbackContext, "emailverificationnotsent", null);
+                    }
+                }
+            });
+        }
+
+        return true;
+    }
+
     private boolean initialise(JSONArray args, final CallbackContext callbackContext) {
 
         Log.d(TAG, "initialise");
@@ -200,7 +243,7 @@ private AuthUI.SignInIntentBuilder buildCustomInstance() {
             }
             instance = instance.setIsSmartLockEnabled(smartLockEnabled, smartLockHints);
         } catch (JSONException ex) {
-          Log.e(TAG, "Error in buildCustomInstance ", ex);
+            Log.e(TAG, "Error in buildCustomInstance ", ex);
         }
 
         return instance;
@@ -286,7 +329,7 @@ private void raiseErrorEvent(String event, int code, String message) {
             data.put("code", code);
             data.put("message", message);
         } catch (JSONException e) {
-          Log.e(TAG, "Error in raiseErrorEvent ", e);
+            Log.e(TAG, "Error in raiseErrorEvent ", e);
         }
         raiseEvent(callbackContext, event, data);
     }
@@ -297,15 +340,23 @@ private void raiseEventForUser(FirebaseUser user) {
         Log.d(TAG, "raiseEventForUser");
 
         try {
+
+            anonymous = false;
+
             resultData.put("name", user.getDisplayName());
             resultData.put("email", user.getEmail());
             resultData.put("emailVerified", user.isEmailVerified());
             resultData.put("id", user.getUid());
+            if (user.getMetadata().getCreationTimestamp() == user.getMetadata().getLastSignInTimestamp()) {
+                resultData.put("newUser", true);
+            } else {
+                resultData.put("newUser", false);
+            }
             if (user.getPhotoUrl() != null) {
                 resultData.put("photoUrl", user.getPhotoUrl().toString());
             }
         } catch (JSONException e) {
-          Log.e(TAG, "Error in raiseEventForUser ", e);
+            Log.e(TAG, "Error in raiseEventForUser ", e);
         }
 
         raiseEvent(callbackContext, "signinsuccess", resultData);
@@ -344,7 +395,7 @@ private void raiseEvent(CallbackContext callbackContext, String type, Object dat
                 event.put("data", data);
             }
         } catch (JSONException e) {
-          Log.e(TAG, "Error in raiseEvent ", e);
+            Log.e(TAG, "Error in raiseEvent ", e);
         }
 
         PluginResult result = new PluginResult(PluginResult.Status.OK, event);
@@ -363,7 +414,7 @@ public void onComplete(@NonNull Task<AuthResult> task) {
                 data.put("code", err.getClass().getSimpleName());
                 data.put("message", err.getMessage());
             } catch (JSONException e) {
-              Log.e(TAG, "Error in onComplete ", e);
+                Log.e(TAG, "Error in onComplete ", e);
             }
             raiseEvent(callbackContext, "signinfailure", data);
         }

src/ios/FirebaseUIAuthPlugin.h

@@ -10,6 +10,8 @@
 - (void)signOut:(CDVInvokedUrlCommand *)command;
 - (void)getToken:(CDVInvokedUrlCommand *)command;
 - (void)deleteUser:(CDVInvokedUrlCommand *)command;
+- (void)sendEmailVerification:(CDVInvokedUrlCommand *)command;
+- (void)reloadUser:(CDVInvokedUrlCommand *)command;
 
 @property(strong,nonatomic) FUIAuth *authUI;
 @property(strong,nonatomic) NSMutableArray<id<FUIAuthProvider>> *providers;

src/ios/FirebaseUIAuthPlugin.m

@@ -212,6 +212,44 @@ - (void)deleteUser:(CDVInvokedUrlCommand *)command {
     }
 }
 
+- (void)sendEmailVerification:(CDVInvokedUrlCommand *)command {
+
+    @try {
+        
+        FIRUser *user = [[FIRAuth auth] currentUser];
+        
+        [user sendEmailVerificationWithCompletion:^(NSError * _Nullable error) {
+            if (error) {
+                [self raiseEvent:@"emailverificationnotsent" withData:nil];
+            } else {
+                [self raiseEvent:@"emailverificationsent" withData:nil];
+                [self signInAnonymous];
+            }
+        }];
+    }
+    @catch (NSException *exception) {
+        NSLog(@"SignOut error %@", [exception reason]);
+        @throw exception;
+    }
+}
+
+- (void)reloadUser:(CDVInvokedUrlCommand *)command {
+
+    @try {
+        
+        FIRUser *user = [[FIRAuth auth] currentUser];
+        
+        [user reload:^(NSError * _Nullable error);
+
+        [self raiseEventForUser:user];
+
+    }
+    @catch (NSException *exception) {
+        NSLog(@"SignOut error %@", [exception reason]);
+        @throw exception;
+    }
+}
+
 - (void)authUI:(nonnull FUIAuth *)authUI didSignInWithUser:(nullable FIRUser *)user error:(nullable NSError *)error {
     if (error == nil) {
         [self raiseEventForUser:user];
@@ -242,24 +280,34 @@ - (void)raiseEventForUser:(FIRUser *)user {
 
     NSNumber *isEmailVerified;
 
+    NSNumber *newUser;
+
     if ([user isEmailVerified]) {
         isEmailVerified = @YES;
     } else {
         isEmailVerified = @NO;
     }
 
+    if ([user metaData]) {
+        newUser = @YES;
+    } else {
+        newUser = @NO;
+    }
+
     if ([user photoURL] != nil) {
          result = @{@"email" : [self emptyIfNull:[user email]],
                     @"emailVerified" : isEmailVerified,
                     @"name" : [self emptyIfNull:[user displayName]],
                     @"id" : [self emptyIfNull:[user uid]],
-                    @"photoUrl" : [[user photoURL] absoluteString]
+                    @"photoUrl" : [[user photoURL] absoluteString],
+                    @"newUser" : newUser
                     };
     } else {
         result = @{@"email" : [self emptyIfNull:[user email]],
                    @"emailVerified" : isEmailVerified,
                    @"name" : [self emptyIfNull:[user displayName]],
-                   @"id" : [self emptyIfNull:[user uid]]
+                   @"id" : [self emptyIfNull:[user uid]],
+                   @"newUser" : newUser
                    };
     }
 

www/browser/firebaseUIAuthPlugin.js

@@ -133,13 +133,30 @@ function FirebaseUIAuth(options, resolve) {
     return false;
   };
 
+  this.reloadUser = function() {
+
+    var self = this;
+
+    firebase.auth().currentUser.reload().then(function() {
+      self.raiseEventForUser(firebase.auth().currentUser);
+    });
+  };
+
   this.raiseEventForUser = function(user) {
+
+    var newUser = false;
+
+    if (user.metadata.creationTime === user.metadata.lastSignInTime) {
+      newUser = true;
+    }
+
     var detail = {
       "detail": {
         "name": user.displayName,
         "email": user.email,
         "emailVerified": user.emailVerified,
-        "id": user.uid
+        "id": user.uid,
+        "newUser": newUser
       }
     };
 
@@ -185,6 +202,20 @@ function FirebaseUIAuth(options, resolve) {
     }
   };
 
+  this.sendEmailVerification = function() {
+
+    var currentUser = firebase.auth().currentUser;
+    var customEvent;
+
+    currentUser.sendEmailVerification().then(function() {
+      customEvent = new CustomEvent("emailverificationsent", {});
+      window.dispatchEvent(customEvent);
+    }, function(error) {
+      customEvent = new CustomEvent("emailverificationnotsent", {});
+      window.dispatchEvent(customEvent);
+    });
+  }
+
   this.signOut = function() {
     firebase.auth().signOut();
     var customEvent = new CustomEvent("signoutsuccess", {});

www/firebaseUIAuthPlugin.js

@@ -32,6 +32,13 @@ function FirebaseUIAuth(options) {
     return exec(dispatchEvent, null, PLUGIN_NAME, 'deleteUser', []);
   };
 
+  this.sendEmailVerification = function() {
+    return exec(dispatchEvent, null, PLUGIN_NAME, 'sendEmailVerification', []);
+  }
+
+  this.reloadUser = function() {
+    return exec(dispatchEvent, null, PLUGIN_NAME, 'reloadUser', []);
+  }
 }
 
 module.exports = {