[Phone Auth] No event when clicking "cancel" on verification Prompt #1082

Author: EddyVerbruggen

src/firebase-common.ts

@@ -143,9 +143,10 @@ export const firebase: any = {
   requestPhoneAuthVerificationCode: (onUserResponse, verificationPrompt) => {
     prompt(verificationPrompt || "Verification code").then(promptResult => {
       if (!promptResult.result) {
-        return;
+        onUserResponse(undefined);
+      } else {
+        onUserResponse(promptResult.text);
       }
-      onUserResponse(promptResult.text);
     });
   },
   // for backward compatibility, because plugin version 4.0.0 moved the params to per-logintype objects

src/firebase.android.ts

@@ -878,6 +878,10 @@ firebase.login = arg => {
               if (firebase._verifyPhoneNumberInProgress) {
                 firebase._verifyPhoneNumberInProgress = false;
                 firebase.requestPhoneAuthVerificationCode(userResponse => {
+                  if (userResponse === undefined && this.reject) {
+                    this.reject("Prompt was canceled");
+                    return;
+                  }
                   const authCredential = com.google.firebase.auth.PhoneAuthProvider.getCredential(verificationId, userResponse);
                   const user = com.google.firebase.auth.FirebaseAuth.getInstance().getCurrentUser();
 

src/firebase.ios.ts

@@ -779,6 +779,10 @@ firebase.login = arg => {
           }
 
           firebase.requestPhoneAuthVerificationCode(userResponse => {
+            if (userResponse === undefined) {
+              reject("Prompt was canceled");
+              return;
+            }
             const fIRAuthCredential = FIRPhoneAuthProvider.provider().credentialWithVerificationIDVerificationCode(verificationID, userResponse);
             if (fAuth.currentUser) {
               const onCompletionLink = (authData: FIRAuthDataResult, error: NSError) => {