[expo-local-authentication] Add support for promptMessage, cancelLabel and disableDeviceFallback on Android

apps/native-component-list/src/screens/LocalAuthenticationScreen.tsx

@@ -33,8 +33,9 @@ export default class LocalAuthenticationScreen extends React.Component<{}, State
     this.setState({ waiting: true });
     try {
       const result = await LocalAuthentication.authenticateAsync({
-        promptMessage: 'This message only shows up on iOS',
-        fallbackLabel: '',
+        promptMessage: 'Authenticate',
+        cancelLabel: 'Cancel label',
+        disableDeviceFallback: true,
       });
       if (result.success) {
         alert('Authenticated!');

packages/expo-local-authentication/android/src/main/java/expo/modules/localauthentication/LocalAuthenticationModule.java

@@ -15,6 +15,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Executor;
 import java.util.concurrent.Executors;
 
@@ -32,7 +33,6 @@ public class LocalAuthenticationModule extends ExportedModule {
   private boolean mIsAuthenticating = false;
   private ModuleRegistry mModuleRegistry;
   private UIManager mUIManager;
-
   private static final int AUTHENTICATION_TYPE_FINGERPRINT = 1;
 
   private final BiometricPrompt.AuthenticationCallback mAuthenticationCallback =
@@ -96,7 +96,7 @@ public void isEnrolledAsync(final Promise promise) {
   }
 
   @ExpoMethod
-  public void authenticateAsync(final Promise promise) {
+  public void authenticateAsync(final Map<String, Object> options, final Promise promise) {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
       promise.reject("E_NOT_SUPPORTED", "Cannot display biometric prompt on android versions below 6.0");
       return;
@@ -130,6 +130,22 @@ public void run() {
           return;
         }
 
+        String promptMessage = "";
+        String cancelLabel = "";
+        boolean disableDeviceFallback = false;
+
+        if (options.containsKey("promptMessage")) {
+          promptMessage = (String) options.get("promptMessage");
+        }
+
+        if (options.containsKey("cancelLabel")) {
+          cancelLabel = (String) options.get("cancelLabel");
+        }
+
+        if (options.containsKey("disableDeviceFallback")) {
+          disableDeviceFallback = (Boolean) options.get("disableDeviceFallback");
+        }
+
         mIsAuthenticating = true;
         mPromise = promise;
         mCancellationSignal = new CancellationSignal();
@@ -138,10 +154,13 @@ public void run() {
         Executor executor = Executors.newSingleThreadExecutor();
         BiometricPrompt biometricPrompt = new BiometricPrompt(fragmentActivity, executor, mAuthenticationCallback);
 
-        BiometricPrompt.PromptInfo promptInfo = new BiometricPrompt.PromptInfo.Builder()
-                .setDeviceCredentialAllowed(true)
-                .setTitle("Authenticate")
-                .build();
+        BiometricPrompt.PromptInfo.Builder promptInfoBuilder = new BiometricPrompt.PromptInfo.Builder()
+                .setDeviceCredentialAllowed(!disableDeviceFallback)
+                .setTitle(promptMessage);
+        if (cancelLabel != null && disableDeviceFallback) {
+          promptInfoBuilder.setNegativeButtonText(cancelLabel);
+        }
+        BiometricPrompt.PromptInfo promptInfo = promptInfoBuilder.build();
         biometricPrompt.authenticate(promptInfo);
       }
     });

packages/expo-local-authentication/src/LocalAuthentication.ts

@@ -1,6 +1,5 @@
 import { UnavailabilityError } from '@unimodules/core';
 import invariant from 'invariant';
-import { Platform } from 'react-native';
 
 import ExpoLocalAuthentication from './ExpoLocalAuthentication';
 import {
@@ -47,24 +46,20 @@ export async function authenticateAsync(
     options = { promptMessage: options };
   }
 
-  if (Platform.OS === 'ios') {
-    if (options.hasOwnProperty('promptMessage')) {
-      invariant(
-        typeof options.promptMessage === 'string' && options.promptMessage.length,
-        'LocalAuthentication.authenticateAsync : `options.promptMessage` must be a non-empty string.'
-      );
-    }
+  if (options.hasOwnProperty('promptMessage')) {
+    invariant(
+      typeof options.promptMessage === 'string' && options.promptMessage.length,
+      'LocalAuthentication.authenticateAsync : `options.promptMessage` must be a non-empty string.'
+    );
+  }
 
-    const promptMessage = options.promptMessage || 'Authenticate';
-    const result = await ExpoLocalAuthentication.authenticateAsync({ ...options, promptMessage });
+  const promptMessage = options.promptMessage || 'Authenticate';
+  const result = await ExpoLocalAuthentication.authenticateAsync({ ...options, promptMessage });
 
-    if (result.warning) {
-      console.warn(result.warning);
-    }
-    return result;
-  } else {
-    return await ExpoLocalAuthentication.authenticateAsync();
+  if (result.warning) {
+    console.warn(result.warning);
   }
+  return result;
 }
 
 export async function cancelAuthenticate(): Promise<void> {

packages/expo-local-authentication/src/LocalAuthentication.types.ts

@@ -6,9 +6,9 @@ export enum AuthenticationType {
 }
 
 export type LocalAuthenticationOptions = {
-  // iOS only
   promptMessage?: string;
   cancelLabel?: string;
-  fallbackLabel?: string;
   disableDeviceFallback?: boolean;
+  // iOS only
+  fallbackLabel?: string;
 };

packages/expo-local-authentication/src/__tests__/LocalAuthentication-test.ios.ts → packages/expo-local-authentication/src/__tests__/LocalAuthentication-test.native.ts

@@ -6,7 +6,7 @@ beforeEach(() => {
   ExpoLocalAuthentication.authenticateAsync.mockImplementation(async () => ({ success: true }));
 });
 
-it(`uses options on iOS`, async () => {
+it(`uses options`, async () => {
   const options = {
     promptMessage: 'Authentication is required',
     cancelLabel: 'Abort',
@@ -18,7 +18,7 @@ it(`uses options on iOS`, async () => {
   expect(ExpoLocalAuthentication.authenticateAsync).toHaveBeenLastCalledWith(options);
 });
 
-it(`throws when an invalid message is used on iOS`, async () => {
+it(`throws when an invalid message is used`, async () => {
   expect(
     LocalAuthentication.authenticateAsync({ promptMessage: undefined as any })
   ).rejects.toThrow();