feat: introduced autoOTPVerify for Android devices

packages/auth/android/src/main/java/io/invertase/firebase/auth/ReactNativeFirebaseAuthModule.java

@@ -981,7 +981,7 @@ private void signInWithProvider(String appName, ReadableMap provider, final Prom
    */
   @ReactMethod
   public void signInWithPhoneNumber(
-      String appName, final String phoneNumber, final boolean forceResend, final Promise promise) {
+      String appName, final String phoneNumber, final boolean forceResend, final Promise promise, final boolean autoOTPVerify) {
     Log.d(TAG, "signInWithPhoneNumber");
     FirebaseApp firebaseApp = FirebaseApp.getInstance(appName);
     final FirebaseAuth firebaseAuth = FirebaseAuth.getInstance(firebaseApp);
@@ -1080,10 +1080,10 @@ public void onCodeAutoRetrievalTimeOut(String verificationId) {
       if (forceResend && mForceResendingToken != null) {
         PhoneAuthProvider.getInstance(firebaseAuth)
             .verifyPhoneNumber(
-                phoneNumber, 60, TimeUnit.SECONDS, activity, callbacks, mForceResendingToken);
+                phoneNumber, autoOTPVerify ? 60 : 0, TimeUnit.SECONDS, activity, callbacks, mForceResendingToken);
       } else {
         PhoneAuthProvider.getInstance(firebaseAuth)
-            .verifyPhoneNumber(phoneNumber, 60, TimeUnit.SECONDS, activity, callbacks);
+            .verifyPhoneNumber(phoneNumber, autoOTPVerify ? 60 : 0, TimeUnit.SECONDS, activity, callbacks);
       }
     }
   }
@@ -1113,7 +1113,7 @@ public void getSession(final String appName, final Promise promise) {
 
   @ReactMethod
   public void verifyPhoneNumberWithMultiFactorInfo(
-      final String appName, final String hintUid, final String sessionKey, final Promise promise) {
+      final String appName, final String hintUid, final String sessionKey, final Promise promise, final boolean autoOTPVerify) {
     final MultiFactorResolver resolver = mCachedResolvers.get(sessionKey);
     if (resolver == null) {
       // See https://firebase.google.com/docs/reference/node/firebase.auth.multifactorresolver for
@@ -1153,7 +1153,7 @@ public void verifyPhoneNumberWithMultiFactorInfo(
         PhoneAuthOptions.newBuilder(firebaseAuth)
             .setActivity(activity)
             .setMultiFactorHint((PhoneMultiFactorInfo) selectedHint)
-            .setTimeout(30L, TimeUnit.SECONDS)
+            .setTimeout(autoOTPVerify ? 30L : 0L, TimeUnit.SECONDS)
             .setMultiFactorSession(resolver.getSession())
             .setCallbacks(
                 new PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
@@ -1185,7 +1185,8 @@ public void verifyPhoneNumberForMultiFactor(
       final String appName,
       final String phoneNumber,
       final String sessionKey,
-      final Promise promise) {
+      final Promise promise,
+      final boolean autoOTPVerify) {
     final MultiFactorSession multiFactorSession = mMultiFactorSessions.get(sessionKey);
     if (multiFactorSession == null) {
       rejectPromiseWithCodeAndMessage(
@@ -1198,7 +1199,7 @@ public void verifyPhoneNumberForMultiFactor(
         PhoneAuthOptions.newBuilder(firebaseAuth)
             .setPhoneNumber(phoneNumber)
             .setActivity(getCurrentActivity())
-            .setTimeout(30L, TimeUnit.SECONDS)
+            .setTimeout(autoOTPVerify ? 30L : 0L, TimeUnit.SECONDS)
             .setMultiFactorSession(multiFactorSession)
             .requireSmsValidation(true)
             .setCallbacks(

packages/auth/lib/PhoneAuthListener.js

@@ -21,12 +21,13 @@ import NativeFirebaseError from '@react-native-firebase/app/lib/internal/NativeF
 let REQUEST_ID = 0;
 
 export default class PhoneAuthListener {
-  constructor(auth, phoneNumber, timeout, forceResend) {
+  constructor(auth, phoneNumber, timeout, forceResend, autoOTPVerify) {
     this._auth = auth;
     this._reject = null;
     this._resolve = null;
     this._promise = null;
     this._jsStack = new Error().stack;
+    this._autoOTPVerify = autoOTPVerify
 
     this._timeout = timeout || 20;
     this._phoneAuthRequestId = REQUEST_ID++;
@@ -50,11 +51,13 @@ export default class PhoneAuthListener {
     this._subscribeToEvents();
 
     if (isAndroid) {
+      this._auth.
       this._auth.native.verifyPhoneNumber(
         phoneNumber,
         this._phoneAuthRequestId + '',
         this._timeout,
         this._forceResending,
+        this._autoOTPVerify
       );
     }
 

packages/auth/lib/Settings.js

@@ -22,12 +22,21 @@ export default class Settings {
     this._auth = auth;
     this._forceRecaptchaFlowForTesting = false;
     this._appVerificationDisabledForTesting = false;
+    this._autoOTPVerify = true; /* Android only */
   }
 
   get forceRecaptchaFlowForTesting() {
     return this._forceRecaptchaFlowForTesting;
   }
 
+  get autoOTPVerify() {
+    return this._autoOTPVerify;
+  }
+
+  set autoOTPVerify(autoOTPVerify) {
+    this._autoOTPVerify = autoOTPVerify;
+  }
+
   set forceRecaptchaFlowForTesting(forceRecaptchaFlow) {
     if (isAndroid) {
       this._forceRecaptchaFlowForTesting = forceRecaptchaFlow;

packages/auth/lib/index.d.ts

@@ -1116,6 +1116,33 @@ export namespace FirebaseAuthTypes {
      * @param smsCode The pre-set SMS code.
      */
     setAutoRetrievedSmsCodeForPhoneNumber(phoneNumber: string, smsCode: string): Promise<null>;
+
+    /**
+     * Flag to disable automatic retrieval of SMS codes for the given phone number.
+     * When receiving a verification code Android automagically digests the OTP code,
+     * in some cases this can cause issues like "OTP already used".
+     * Use it only if absolutely necessary.
+     *
+     * @android
+     */
+    autoOTPVerify: boolean;
+
+    /**
+     * Sets whether the automatic OTP (One-Time Password) verification should be disabled on Android devices.
+     *
+     * This method allows you to control the behavior of OTP verification by disabling the automatic retrieval
+     * and verification of SMS codes. This can be useful in testing scenarios or when you want to handle OTP
+     * verification manually if your users encounter "OTP already used" errors on some devices.
+     *
+     * @example
+     * ```js
+     * await firebase.auth().settings.setAutoOTPVerify(false);
+     * ```
+     *
+     * @android
+     * @param status whether auto OTP verify should be disabled, defaults to false
+     */
+    setAutoOTPVerify(status: boolean): Promise<null>;
   }
 
   /**

packages/auth/lib/index.js

@@ -282,7 +282,7 @@ class FirebaseAuthModule extends FirebaseModule {
   signInWithPhoneNumber(phoneNumber, forceResend) {
     if (isAndroid) {
       return this.native
-        .signInWithPhoneNumber(phoneNumber, forceResend || false)
+        .signInWithPhoneNumber(phoneNumber, forceResend || false, this._settings.autoOTPVerify)
         .then(result => new ConfirmationResult(this, result.verificationId));
     }
 
@@ -294,14 +294,15 @@ class FirebaseAuthModule extends FirebaseModule {
   verifyPhoneNumber(phoneNumber, autoVerifyTimeoutOrForceResend, forceResend) {
     let _forceResend = forceResend;
     let _autoVerifyTimeout = 60;
+    let _autoOTPVerify = this._settings.autoOTPVerify
 
     if (isBoolean(autoVerifyTimeoutOrForceResend)) {
       _forceResend = autoVerifyTimeoutOrForceResend;
     } else {
       _autoVerifyTimeout = autoVerifyTimeoutOrForceResend;
     }
 
-    return new PhoneAuthListener(this, phoneNumber, _autoVerifyTimeout, _forceResend);
+    return new PhoneAuthListener(this, phoneNumber, _autoVerifyTimeout, _forceResend, _autoOTPVerify);
   }
 
   verifyPhoneNumberWithMultiFactorInfo(multiFactorHint, session) {