Re-Authenticate a user #245

EddyVerbruggen · EddyVerbruggen · commit 18d6ab0fbd19 · 2017-01-02T17:36:59.000+01:00
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ You can also change the configuration by deleting the `firebase.nativescript.jso
 Install the latest packages 'Google Play Services' and 'Google Repository' in your [Android SDK Manager](http://stackoverflow.com/a/37310513)
 
 #### Google Play Services Version
-The plugin will default to version 9.8.0+ of the Android `play-services-base` SDK.
+The plugin will default to version 10.0+ of the Android `play-services-base` SDK.
 If you need to change the version (to for instance the latest version), you can add a project ext property `googlePlayServicesVersion` like so:
 
 ```
diff --git a/docs/AUTHENTICATION.md b/docs/AUTHENTICATION.md
@@ -96,6 +96,24 @@ Once the user is logged in you can retrieve the currently logged in user.
   });
 ```
 
+### Updating a profile
+Pass in at least one of `displayName` and `photoURL`.
+The logged in user will be updated, but for `getCurrentUser` to reflect the change you'll need to do a logout-login.
+
+```js
+  firebase.updateProfile({
+    displayName: 'Eddy Verbruggen',
+    photoURL: 'http://provider.com/profiles/eddyverbruggen.png'
+  }).then(
+      function () {
+        // called when update profile was successful
+      },
+      function (errorMessage) {
+        console.log(errorMessage);
+      }
+  );
+```
+
 ### Anonymous login
 Don't forget to enable anonymous login in your firebase instance.
 
@@ -166,24 +184,6 @@ Don't forget to enable email-password login in your firebase instance.
   );
 ```
 
-#### Updating a profile
-Pass in at least one of `displayName` and `photoURL`.
-The logged in user will be updated, but for `getCurrentUser` to reflect the change you'll need to do a logout-login.
-
-```js
-  firebase.updateProfile({
-    displayName: 'Eddy Verbruggen',
-    photoURL: 'http://provider.com/profiles/eddyverbruggen.png'
-  }).then(
-      function () {
-        // called when update profile was successful
-      },
-      function (errorMessage) {
-        console.log(errorMessage);
-      }
-  );
-```
-
 #### Resetting a password
 ```js
   firebase.resetPassword({
@@ -357,6 +357,34 @@ Shouldn't be more complicated than:
   firebase.logout();
 ```
 
+### reauthenticate
+Some security-sensitive actions (deleting an account, changing a password) require that the user has recently signed in.
+If you perform one of these actions, and the user signed in too long ago, the action fails.
+When this happens (or to prevent it from happening), re-authenticate the user.
+
+```js
+  firebase.reauthenticate({
+    type: firebase.LoginType.PASSWORD, // or GOOGLE / FACEBOOK
+    // these are only required in type = PASSWORD
+    email: 'user@domain.com',
+    password: 'thePassword'
+  }).then(
+      function () {
+        // you can now safely delete the account / change the password
+        dialogs.alert({
+          title: "Re-authenticated user",
+          okButtonText: "OK"
+        });
+      },
+      function (error) {
+        dialogs.alert({
+          title: "Re-authenticate error",
+          message: error,
+          okButtonText: "OK"
+        });
+      }
+  );
+```
 
 ### sendEmailVerification
 Sending an "email confirmation" email can be done after the user logged in:
diff --git a/firebase.android.js b/firebase.android.js
@@ -7,6 +7,8 @@ firebase._launchNotification = null;
 
 // we need to cache and restore the context, otherwise the next invocation is broken
 firebase._rememberedContext = null;
+firebase._googleSignInIdToken = null;
+firebase._facebookAccessToken = null;
 
 var fbCallbackManager = null;
 var GOOGLE_SIGNIN_INTENT_ID = 123;
@@ -654,8 +656,8 @@ firebase.login = function (arg) {
             fbCallbackManager,
             new com.facebook.FacebookCallback({
               onSuccess: function (loginResult) {
-                var token = loginResult.getAccessToken().getToken();
-                var authCredential = com.google.firebase.auth.FacebookAuthProvider.getCredential(token);
+                firebase._facebookAccessToken = loginResult.getAccessToken().getToken();
+                var authCredential = com.google.firebase.auth.FacebookAuthProvider.getCredential(firebase._facebookAccessToken);
 
                 var user = com.google.firebase.auth.FirebaseAuth.getInstance().getCurrentUser();
                 if (user) {
@@ -728,9 +730,9 @@ firebase.login = function (arg) {
             var success = googleSignInResult.isSuccess();
             if (success) {
               var googleSignInAccount = googleSignInResult.getSignInAccount();
-              var idToken = googleSignInAccount.getIdToken();
+              firebase._googleSignInIdToken = googleSignInAccount.getIdToken();
               var accessToken = null;
-              var authCredential = com.google.firebase.auth.GoogleAuthProvider.getCredential(idToken, accessToken);
+              var authCredential = com.google.firebase.auth.GoogleAuthProvider.getCredential(firebase._googleSignInIdToken, accessToken);
 
               firebase._mGoogleApiClient.connect();
 
@@ -772,6 +774,62 @@ firebase._alreadyLinkedToAuthProvider = function (user, providerId) {
   return false;
 };
 
+firebase.reauthenticate = function (arg) {
+  return new Promise(function (resolve, reject) {
+    try {
+      var user = com.google.firebase.auth.FirebaseAuth.getInstance().getCurrentUser();
+      if (user === null) {
+        reject("no current user");
+        return;
+      }
+
+      var authCredential = null;
+      if (arg.type === firebase.LoginType.PASSWORD) {
+        if (!arg.email || !arg.password) {
+          reject("Auth type emailandpassword requires an email and password argument");
+        } else {
+          authCredential = com.google.firebase.auth.EmailAuthProvider.getCredential(arg.email, arg.password);
+        }
+
+      } else if (arg.type === firebase.LoginType.GOOGLE) {
+        if (!firebase._googleSignInIdToken) {
+          reject("Not currently logged in with Google");
+          return;
+        }
+        authCredential = com.google.firebase.auth.GoogleAuthProvider.getCredential(firebase._googleSignInIdToken, null);
+
+      } else if (arg.type === firebase.LoginType.FACEBOOK) {
+        if (!firebase._facebookAccessToken) {
+          reject("Not currently logged in with Facebook");
+          return;
+        }
+        authCredential = com.google.firebase.auth.FacebookAuthProvider.getCredential(firebase._facebookAccessToken);
+      }
+
+      if (authCredential === null) {
+        reject("arg.type should be one of LoginType.PASSWORD | LoginType.GOOGLE | LoginType.FACEBOOK");
+        return;
+      }
+
+      var onCompleteListener = new com.google.android.gms.tasks.OnCompleteListener({
+        onComplete: function (task) {
+          if (task.isSuccessful()) {
+            resolve();
+          } else {
+            // TODO extract error
+            reject("Reathentication failed");
+          }
+        }
+      });
+      user.reauthenticate(authCredential).addOnCompleteListener(onCompleteListener);
+
+    } catch (ex) {
+      console.log("Error in firebase.reauthenticate: " + ex);
+      reject(ex);
+    }
+  });
+};
+
 firebase.resetPassword = function (arg) {
   return new Promise(function (resolve, reject) {
     try {
diff --git a/firebase.ios.js b/firebase.ios.js
@@ -9,6 +9,7 @@ var platform = require("platform");
 firebase._messagingConnected = null;
 firebase._pendingNotifications = [];
 firebase._receivedPushTokenCallback = null;
+firebase._gIDAuthentication = null;
 
 firebase._addObserver = function (eventName, callback) {
   var queue = utils.ios.getter(NSOperationQueue, NSOperationQueue.mainQueue);
@@ -865,8 +866,8 @@ firebase.login = function (arg) {
         var delegate = GIDSignInDelegateImpl.new().initWithCallback(function (user, error) {
           if (error === null) {
             // Get a Google ID token and Google access token from the GIDAuthentication object and exchange them for a Firebase credential
-            var authentication = user.authentication;
-            var fIRAuthCredential = FIRGoogleAuthProvider.credentialWithIDTokenAccessToken(authentication.idToken, authentication.accessToken);
+            firebase._gIDAuthentication = user.authentication;
+            var fIRAuthCredential = FIRGoogleAuthProvider.credentialWithIDTokenAccessToken(firebase._gIDAuthentication.idToken, firebase._gIDAuthentication.accessToken);
 
             // Finally, authenticate with Firebase using the credential
             if (fAuth.currentUser) {
@@ -903,6 +904,67 @@ firebase.login = function (arg) {
   });
 };
 
+firebase.reauthenticate = function (arg) {
+  return new Promise(function (resolve, reject) {
+    try {
+      var fAuth = FIRAuth.auth();
+      if (fAuth === null) {
+        reject("Run init() first!");
+        return;
+      }
+
+      var user = fAuth.currentUser;
+      if (user === null) {
+        reject("no current user");
+        return;
+      }
+
+      var authCredential = null;
+      if (arg.type === firebase.LoginType.PASSWORD) {
+        if (!arg.email || !arg.password) {
+          reject("Auth type emailandpassword requires an email and password argument");
+        } else {
+          authCredential = FIREmailPasswordAuthProvider.credentialWithEmailPassword(arg.email, arg.password);
+        }
+
+      } else if (arg.type === firebase.LoginType.GOOGLE) {
+        if (!firebase._gIDAuthentication) {
+          reject("Not currently logged in with Google");
+          return;
+        }
+        authCredential = FIRGoogleAuthProvider.credentialWithIDTokenAccessToken(firebase._gIDAuthentication.idToken, firebase._gIDAuthentication.accessToken);
+
+      } else if (arg.type === firebase.LoginType.FACEBOOK) {
+        var currentAccessToken = FBSDKAccessToken.currentAccessToken();
+        if (!currentAccessToken) {
+          reject("Not currently logged in with Facebook");
+          return;
+        }
+        authCredential = FIRFacebookAuthProvider.credentialWithAccessToken(currentAccessToken.tokenString);
+      }
+
+      if (authCredential === null) {
+        reject("arg.type should be one of LoginType.PASSWORD | LoginType.GOOGLE | LoginType.FACEBOOK");
+        return;
+      }
+
+      var onCompletion = function(error) {
+        if (error) {
+          reject(error.localizedDescription);
+
+        } else {
+          resolve();
+        }
+      };
+      user.reauthenticateWithCredentialCompletion(authCredential, onCompletion);
+
+    } catch (ex) {
+      console.log("Error in firebase.reauthenticate: " + ex);
+      reject(ex);
+    }
+  });
+};
+
 firebase.resetPassword = function (arg) {
   return new Promise(function (resolve, reject) {
     try {
diff --git a/index.d.ts b/index.d.ts
@@ -191,6 +191,12 @@ export interface LoginOptions {
     scope?: string[];
 }
 
+export interface ReauthenticateOptions {
+    type: LoginType;
+    email?: string;
+    password?: string;
+}
+
 /**
  * The returned object from the login function.
  */
@@ -520,6 +526,8 @@ export module analytics {
 // Auth
 export function login(options: LoginOptions): Promise<User>;
 
+export function reauthenticate(options: ReauthenticateOptions): Promise<any>;
+
 export function getAuthToken(option: GetAuthTokenOptions): Promise<string>;
 
 export function logout(): Promise<any>;
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "nativescript-plugin-firebase",
-  "version": "3.8.5",
+  "version": "3.9.0-dev",
   "description": "Fire. Base. Firebase!",
   "main": "firebase",
   "typings": "index.d.ts",
diff --git a/platforms/android/include.gradle b/platforms/android/include.gradle
@@ -14,29 +14,29 @@ repositories {
 
 dependencies {
     // make sure you have these versions by updating your local Android SDK's (Android Support repo and Google repo)
-    compile "com.google.firebase:firebase-core:9.8.+"
-    compile "com.google.firebase:firebase-database:9.8.+"
-    compile "com.google.firebase:firebase-auth:9.8.+"
-    compile "com.google.firebase:firebase-crash:9.8.+"
+    compile "com.google.firebase:firebase-core:10.0.+"
+    compile "com.google.firebase:firebase-database:10.0.+"
+    compile "com.google.firebase:firebase-auth:10.0.+"
+    compile "com.google.firebase:firebase-crash:10.0.+"
 
     // for reading google-services.json and configuration
-    def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : '9.8.+'
+    def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : '10.0.+'
     compile "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
 
     // Uncomment if you want to use 'Remote Config'
-//    compile "com.google.firebase:firebase-config:9.8.+"
+//    compile "com.google.firebase:firebase-config:10.0.+"
 
     // Uncomment if you want FCM (Firebase Cloud Messaging)
-//    compile "com.google.firebase:firebase-messaging:9.8.+"
+//    compile "com.google.firebase:firebase-messaging:10.0.+"
 
     // Uncomment if you want Google Cloud Storage
-//    compile 'com.google.firebase:firebase-storage:9.8.+'
+//    compile 'com.google.firebase:firebase-storage:10.0.+'
 
     // Uncomment if you need Facebook Authentication
 //    compile "com.facebook.android:facebook-android-sdk:4.+"
 
     // Uncomment if you need Google Sign-In Authentication
-//    compile "com.google.android.gms:play-services-auth:9.8.+"
+//    compile "com.google.android.gms:play-services-auth:10.0.+"
 
 }
 
diff --git a/platforms/ios/Podfile b/platforms/ios/Podfile
@@ -1,5 +1,5 @@
 
-pod 'Firebase', '~> 3.9.0'
+pod 'Firebase', '~> 3.11.0'
 pod 'Firebase/Database'
 pod 'Firebase/Auth'
 pod 'Firebase/Crash'
diff --git a/scripts/installer.js b/scripts/installer.js
@@ -191,7 +191,7 @@ function writePodFile(result) {
     }
     try {
         fs.writeFileSync(directories.ios + '/Podfile',
-`pod 'Firebase', '~> 3.9.0'
+`pod 'Firebase', '~> 3.11.0'
 pod 'Firebase/Database'
 pod 'Firebase/Auth'
 pod 'Firebase/Crash'
@@ -245,29 +245,29 @@ repositories {
 
 dependencies {
     // make sure you have these versions by updating your local Android SDK's (Android Support repo and Google repo)
-    compile "com.google.firebase:firebase-core:9.8.+"
-    compile "com.google.firebase:firebase-database:9.8.+"
-    compile "com.google.firebase:firebase-auth:9.8.+"
-    compile "com.google.firebase:firebase-crash:9.8.+"
+    compile "com.google.firebase:firebase-core:10.0.+"
+    compile "com.google.firebase:firebase-database:10.0.+"
+    compile "com.google.firebase:firebase-auth:10.0.+"
+    compile "com.google.firebase:firebase-crash:10.0.+"
 
     // for reading google-services.json and configuration
-    def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : '9.8.+'
+    def googlePlayServicesVersion = project.hasProperty('googlePlayServicesVersion') ? project.googlePlayServicesVersion : '10.0.+'
     compile "com.google.android.gms:play-services-base:$googlePlayServicesVersion"
 
     // Uncomment if you want to use 'Remote Config'
-    ` + (isSelected(result.remote_config) ? `` : `//`) + ` compile "com.google.firebase:firebase-config:9.8.+"
+    ` + (isSelected(result.remote_config) ? `` : `//`) + ` compile "com.google.firebase:firebase-config:10.0.+"
 
     // Uncomment if you want FCM (Firebase Cloud Messaging)
-    ` + (isSelected(result.messaging) ? `` : `//`) + ` compile "com.google.firebase:firebase-messaging:9.8.+"
+    ` + (isSelected(result.messaging) ? `` : `//`) + ` compile "com.google.firebase:firebase-messaging:10.0.+"
 
     // Uncomment if you want Google Cloud Storage
-    ` + (isSelected(result.storage) ? `` : `//`) + ` compile 'com.google.firebase:firebase-storage:9.8.+'
+    ` + (isSelected(result.storage) ? `` : `//`) + ` compile 'com.google.firebase:firebase-storage:10.0.+'
 
     // Uncomment if you need Facebook Authentication
     ` + (isSelected(result.facebook_auth) ? `` : `//`) + ` compile "com.facebook.android:facebook-android-sdk:4.+"
 
     // Uncomment if you need Google Sign-In Authentication
-    ` + (isSelected(result.google_auth) ? `` : `//`) + ` compile "com.google.android.gms:play-services-auth:9.8.+"
+    ` + (isSelected(result.google_auth) ? `` : `//`) + ` compile "com.google.android.gms:play-services-auth:10.0.+"
 
 }
 
diff --git a/scripts/postinstall.js b/scripts/postinstall.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nativescript-plugin-firebase",`
`3`		`- "version": "3.8.5",`
	`3`	`+ "version": "3.9.0-dev",`
`4`	`4`	`"description": "Fire. Base. Firebase!",`
`5`	`5`	`"main": "firebase",`
`6`	`6`	`"typings": "index.d.ts",`