@capgo/capacitor-native-biometric 7.1.2 → 7.1.7

package/android/src/main/java/ee/forgr/biometric/AuthActivity.java

@@ -57,28 +57,21 @@ public class AuthActivity extends AppCompatActivity {
     boolean useFallback = getIntent().getBooleanExtra("useFallback", false);
     int[] allowedTypes = getIntent().getIntArrayExtra("allowedBiometryTypes");
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-      int authenticators = BiometricManager.Authenticators.BIOMETRIC_STRONG;
-      if (useFallback) {
-        authenticators |= BiometricManager.Authenticators.DEVICE_CREDENTIAL;
-      }
-      if (allowedTypes != null) {
-        // Filter authenticators based on allowed types
-        authenticators = getAllowedAuthenticators(allowedTypes);
-      }
-      builder.setAllowedAuthenticators(authenticators);
-    } else {
-      if (useFallback) {
-        builder.setDeviceCredentialAllowed(true);
-      } else {
-        builder.setNegativeButtonText(
-          getIntent().hasExtra("negativeButtonText")
-            ? Objects.requireNonNull(
-              getIntent().getStringExtra("negativeButtonText")
-            )
-            : "Cancel"
-        );
-      }
+    int authenticators = BiometricManager.Authenticators.BIOMETRIC_STRONG;
+    if (useFallback) {
+      authenticators |= BiometricManager.Authenticators.DEVICE_CREDENTIAL;
+    }
+    if (allowedTypes != null) {
+      // Filter authenticators based on allowed types
+      authenticators = getAllowedAuthenticators(allowedTypes);
+    }
+    builder.setAllowedAuthenticators(authenticators);
+
+    if (!useFallback) {
+      String negativeText = getIntent().getStringExtra("negativeButtonText");
+      builder.setNegativeButtonText(
+        negativeText != null ? negativeText : "Cancel"
+      );
     }
 
     BiometricPrompt.PromptInfo promptInfo = builder.build();
@@ -93,9 +86,16 @@ public class AuthActivity extends AppCompatActivity {
           @NonNull CharSequence errString
         ) {
           super.onAuthenticationError(errorCode, errString);
-          int pluginErrorCode = AuthActivity.convertToPluginErrorCode(
-            errorCode
-          );
+          // Handle lockout cases explicitly
+          if (
+            errorCode == BiometricPrompt.ERROR_LOCKOUT ||
+            errorCode == BiometricPrompt.ERROR_LOCKOUT_PERMANENT
+          ) {
+            int pluginErrorCode = convertToPluginErrorCode(errorCode);
+            finishActivity("error", pluginErrorCode, errString.toString());
+            return;
+          }
+          int pluginErrorCode = convertToPluginErrorCode(errorCode);
           finishActivity("error", pluginErrorCode, errString.toString());
         }
 
@@ -111,11 +111,10 @@ public class AuthActivity extends AppCompatActivity {
         public void onAuthenticationFailed() {
           super.onAuthenticationFailed();
           counter++;
-          if (counter == maxAttempts) finishActivity(
-            "failed",
-            10,
-            "Authentication failed."
-          );
+          if (counter >= maxAttempts) {
+            // Use error code 4 for too many attempts to match iOS behavior
+            finishActivity("error", 4, "Too many failed attempts");
+          }
         }
       }
     );
@@ -153,11 +152,11 @@ public class AuthActivity extends AppCompatActivity {
       case BiometricPrompt.ERROR_HW_NOT_PRESENT:
         return 1;
       case BiometricPrompt.ERROR_LOCKOUT_PERMANENT:
-        return 2;
+        return 2; // Permanent lockout
       case BiometricPrompt.ERROR_NO_BIOMETRICS:
         return 3;
       case BiometricPrompt.ERROR_LOCKOUT:
-        return 4;
+        return 4; // Temporary lockout (too many attempts)
       // Authentication Failure (10) Handled by `onAuthenticationFailed`.
       // App Cancel (11), Invalid Context (12), and Not Interactive (13) are not valid error codes for Android.
       case BiometricPrompt.ERROR_NO_DEVICE_CREDENTIAL:
@@ -168,6 +167,8 @@ public class AuthActivity extends AppCompatActivity {
       case BiometricPrompt.ERROR_USER_CANCELED:
       case BiometricPrompt.ERROR_NEGATIVE_BUTTON:
         return 16;
+      case BiometricPrompt.AUTHENTICATION_RESULT_TYPE_BIOMETRIC:
+        return 0; // Success case, should not be handled here
       default:
         return 0;
     }

package/android/src/main/java/ee/forgr/biometric/NativeBiometric.java

@@ -8,7 +8,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Build;
-import android.security.KeyPairGeneratorSpec;
 import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyProperties;
 import android.security.keystore.StrongBoxUnavailableException;
@@ -74,42 +73,55 @@ public class NativeBiometric extends Plugin {
 
   private int getAvailableFeature() {
     // default to none
-    int type = NONE;
-
-    // if has fingerprint
-    if (
-      getContext()
-        .getPackageManager()
-        .hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)
-    ) {
-      type = FINGERPRINT;
-    }
+    BiometricManager biometricManager = BiometricManager.from(getContext());
 
-    // if has face auth
-    if (
-      getContext()
-        .getPackageManager()
-        .hasSystemFeature(PackageManager.FEATURE_FACE)
-    ) {
-      // if also has fingerprint
-      if (type != NONE) return MULTIPLE;
+    // Check for biometric capabilities
+    int authenticators = BiometricManager.Authenticators.BIOMETRIC_STRONG;
+    int canAuthenticate = biometricManager.canAuthenticate(authenticators);
 
-      type = FACE_AUTHENTICATION;
-    }
+    if (canAuthenticate == BiometricManager.BIOMETRIC_SUCCESS) {
+      // Check specific features
+      PackageManager pm = getContext().getPackageManager();
+      boolean hasFinger = pm.hasSystemFeature(
+        PackageManager.FEATURE_FINGERPRINT
+      );
+      boolean hasIris = false;
+      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+        hasIris = pm.hasSystemFeature(PackageManager.FEATURE_IRIS);
+      }
 
-    // if has iris auth
-    if (
-      getContext()
-        .getPackageManager()
-        .hasSystemFeature(PackageManager.FEATURE_IRIS)
-    ) {
-      // if also has fingerprint or face auth
-      if (type != NONE) return MULTIPLE;
+      // For face, we rely on BiometricManager since it's more reliable
+      boolean hasFace = false;
+      try {
+        // Try to create a face authentication prompt - if it succeeds, face auth is available
+        androidx.biometric.BiometricPrompt.PromptInfo promptInfo =
+          new androidx.biometric.BiometricPrompt.PromptInfo.Builder()
+            .setTitle("Test")
+            .setNegativeButtonText("Cancel")
+            .setAllowedAuthenticators(
+              BiometricManager.Authenticators.BIOMETRIC_STRONG
+            )
+            .build();
+        hasFace = true;
+      } catch (Exception e) {
+        System.out.println(
+          "Error creating face authentication prompt: " + e.getMessage()
+        );
+      }
 
-      type = IRIS_AUTHENTICATION;
+      // Determine the type based on available features
+      if (hasFinger && (hasFace || hasIris)) {
+        return MULTIPLE;
+      } else if (hasFinger) {
+        return FINGERPRINT;
+      } else if (hasFace) {
+        return FACE_AUTHENTICATION;
+      } else if (hasIris) {
+        return IRIS_AUTHENTICATION;
+      }
     }
 
-    return type;
+    return NONE;
   }
 
   @PluginMethod
@@ -121,7 +133,13 @@ public class NativeBiometric extends Plugin {
     );
 
     BiometricManager biometricManager = BiometricManager.from(getContext());
-    int canAuthenticateResult = biometricManager.canAuthenticate();
+    int authenticators = BiometricManager.Authenticators.BIOMETRIC_STRONG;
+    if (useFallback) {
+      authenticators |= BiometricManager.Authenticators.DEVICE_CREDENTIAL;
+    }
+    int canAuthenticateResult = biometricManager.canAuthenticate(
+      authenticators
+    );
     // Using deviceHasCredentials instead of canAuthenticate(DEVICE_CREDENTIAL)
     // > "Developers that wish to check for the presence of a PIN, pattern, or password on these versions should instead use isDeviceSecure."
     // @see https://developer.android.com/reference/androidx/biometric/BiometricManager#canAuthenticate(int)
@@ -153,23 +171,24 @@ public class NativeBiometric extends Plugin {
 
     intent.putExtra("title", call.getString("title", "Authenticate"));
 
-    if (call.hasOption("subtitle")) {
-      intent.putExtra("subtitle", call.getString("subtitle"));
+    String subtitle = call.getString("subtitle");
+    if (subtitle != null) {
+      intent.putExtra("subtitle", subtitle);
     }
 
-    if (call.hasOption("description")) {
-      intent.putExtra("description", call.getString("description"));
+    String description = call.getString("description");
+    if (description != null) {
+      intent.putExtra("description", description);
     }
 
-    if (call.hasOption("negativeButtonText")) {
-      intent.putExtra(
-        "negativeButtonText",
-        call.getString("negativeButtonText")
-      );
+    String negativeButtonText = call.getString("negativeButtonText");
+    if (negativeButtonText != null) {
+      intent.putExtra("negativeButtonText", negativeButtonText);
     }
 
-    if (call.hasOption("maxAttempts")) {
-      intent.putExtra("maxAttempts", call.getInt("maxAttempts"));
+    Integer maxAttempts = call.getInt("maxAttempts");
+    if (maxAttempts != null) {
+      intent.putExtra("maxAttempts", maxAttempts);
     }
 
     // Pass allowed biometry types
@@ -220,7 +239,7 @@ public class NativeBiometric extends Plugin {
         call.resolve();
       } catch (GeneralSecurityException | IOException e) {
         call.reject("Failed to save credentials", e);
-        e.printStackTrace();
+        System.out.println("Error saving credentials: " + e.getMessage());
       }
     } else {
       call.reject("Missing properties");
@@ -443,8 +462,12 @@ public class NativeBiometric extends Plugin {
         ANDROID_KEY_STORE
       );
       keyPairGenerator.initialize(
-        new KeyPairGeneratorSpec.Builder(getContext())
-          .setAlias(KEY_ALIAS)
+        new KeyGenParameterSpec.Builder(
+          KEY_ALIAS,
+          KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT
+        )
+          .setDigests(KeyProperties.DIGEST_SHA256, KeyProperties.DIGEST_SHA512)
+          .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_RSA_PKCS1)
           .build()
       );
       keyPairGenerator.generateKeyPair();
@@ -471,8 +494,7 @@ public class NativeBiometric extends Plugin {
     cipherOutputStream.write(secret);
     cipherOutputStream.close();
 
-    byte[] vals = outputStream.toByteArray();
-    return vals;
+    return outputStream.toByteArray();
   }
 
   private byte[] rsaDecrypt(byte[] encrypted, String KEY_ALIAS)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-native-biometric",
-  "version": "7.1.2",
+  "version": "7.1.7",
   "description": "This plugin gives access to the native biometric apis for android and iOS",
   "main": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",