#376 Add support for firebase phone authentication (support all Android flows)

Author: EddyVerbruggen

CHANGELOG.md

@@ -4,7 +4,7 @@
 [Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
 
 
-## 4.0.0 & 4.0.1 (2017, June 20)
+## 4.0.0, 4.0.1, 4.0.2 (2017, June 20)
 
 [Full changelog](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/milestone/26?closed=1)
 

docs/AUTHENTICATION.md

@@ -239,7 +239,8 @@ Don't forget to enable email-password login in your firebase instance.
   firebase.login({
     type: firebase.LoginType.PHONE,
     phoneOptions: {
-      phoneNumber: '+12345678900'      
+      phoneNumber: '+12345678900',
+      verificationPrompt: "The received verification code" // default "Verification code"
     }
   }).then(
       function (result) {

firebase-common.js

@@ -120,8 +120,8 @@ firebase.strongTypeify = function (value) {
   return value;
 };
 
-firebase.requestPhoneAuthVerificationCode = function (onUserResponse) {
-  dialogs.prompt("Verification code").then(function (promptResult) {
+firebase.requestPhoneAuthVerificationCode = function (onUserResponse, verificationPrompt) {
+  dialogs.prompt(verificationPrompt || "Verification code").then(function (promptResult) {
     if (!promptResult.result) {
       return;
     }

firebase.android.js

@@ -916,12 +916,13 @@ firebase.login = function (arg) {
 
           var OnVerificationStateChangedCallbacks = com.google.firebase.auth.PhoneAuthProvider.OnVerificationStateChangedCallbacks.extend({
             onVerificationCompleted: function(phoneAuthCredential) {
+              console.log("phone number verification completed");
               firebase._verifyPhoneNumberInProgress = false;
               // the user previously authenticated with phone (or no prompt was required), so sign in and complete
               firebaseAuth.signInWithCredential(phoneAuthCredential).addOnCompleteListener(onCompleteListener);
             },
             onVerificationFailed: function(firebaseException) {
-              console.log("onVerificationStateChangedCallbacks.onVerificationFailed: " + firebaseException)
+              console.log("onVerificationStateChangedCallbacks.onVerificationFailed: " + firebaseException);
               firebase._verifyPhoneNumberInProgress = false;
               var errorMessage = firebaseException.getMessage();
               if (errorMessage.indexOf("INVALID_APP_CREDENTIAL") > -1) {
@@ -931,21 +932,14 @@ firebase.login = function (arg) {
               }
             },
             onCodeSent: function(verificationId, forceResendingToken) {
-              // TODO these are printed, but need to run on a device with a mathing phonenr of course..
-              console.log("onVerificationStateChangedCallbacks.onCodeSent.verificationId: " + verificationId)
-              console.log("onVerificationStateChangedCallbacks.onCodeSent.forceResendingToken: " + forceResendingToken)
-
-              // in some cases the prompt is not required, and onVerificationCompleted is called immediately.. not sure about the timing, so using a short timeout
+              // If the device has a SIM card auto-verification may occur in the background (eventually calling onVerificationCompleted)
+              // .. so the prompt would be redundant, but it's recommended by Google not to wait to long before showing the prompt
               setTimeout(function() {
                 if (firebase._verifyPhoneNumberInProgress) {
                   firebase._verifyPhoneNumberInProgress = false;
-
                   firebase.requestPhoneAuthVerificationCode(function(userResponse) {
-                    console.log("onVerificationStateChangedCallbacks com.google.firebase.auth.PhoneAuthCredential: " + com.google.firebase.auth.PhoneAuthCredential)
-                    var authCredential = com.google.firebase.auth.PhoneAuthCredential.getCredential(verificationId, userResponse);
-                    console.log("onVerificationStateChangedCallbacks authCredential: " + authCredential)
+                    var authCredential = com.google.firebase.auth.PhoneAuthProvider.getCredential(verificationId, userResponse);
                     var user = com.google.firebase.auth.FirebaseAuth.getInstance().getCurrentUser();
-                    console.log("onVerificationStateChangedCallbacks user: " + user)
                     if (user) {
                       if (firebase._alreadyLinkedToAuthProvider(user, "phone")) {
                         firebaseAuth.signInWithCredential(authCredential).addOnCompleteListener(onCompleteListener);
@@ -955,9 +949,9 @@ firebase.login = function (arg) {
                     } else {
                       firebaseAuth.signInWithCredential(authCredential).addOnCompleteListener(onCompleteListener);
                     }
-                  });
+                  }, arg.phoneOptions.verificationPrompt);
                 }
-              }, 1000);
+              }, 3000);
             }
           });
 

firebase.d.ts

@@ -174,7 +174,11 @@ export interface FirebasePasswordLoginOptions {
 
 export interface FirebasePhoneLoginOptions {
     phoneNumber: string;
-    // verificationCodePrompt?: string;
+    /**
+     * The message show to the user that prompts him to enter the received verification code.
+     * Default: "Verification code".
+     */
+    verificationPrompt?: string;
 }
 
 export interface FirebaseGoogleLoginOptions {

firebase.ios.js

@@ -1067,7 +1067,7 @@ firebase.login = function (arg) {
             } else {
               fAuth.signInWithCredentialCompletion(fIRAuthCredential, onCompletion);
             }
-          });
+          }, arg.phoneOptions.verificationPrompt);
         });
 
       } else if (arg.type === firebase.LoginType.CUSTOM) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-plugin-firebase",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Fire. Base. Firebase!",
   "main": "firebase",
   "typings": "index.d.ts",