changing LAPolicyDeviceOwnerAuthenticationWithBiometrics to LAPolicyDeviceOwnerAuthentication

TouchID.ios.js

@@ -16,7 +16,7 @@ const { getError, TouchIDError, TouchIDUnifiedError } = require('./errors');
 export default {
   isSupported(config) {
     return new Promise((resolve, reject) => {
-      NativeTouchID.isSupported((error, biometryType) => {
+      NativeTouchID.isSupported(config, (error, biometryType) => {
         if (error) {
           return reject(createError(config, error.message));
         }

TouchID.m

@@ -6,19 +6,37 @@ @implementation TouchID
 
 RCT_EXPORT_MODULE();
 
-RCT_EXPORT_METHOD(isSupported: (RCTResponseSenderBlock)callback)
+RCT_EXPORT_METHOD(isSupported: (NSDictionary *)options
+                  callback: (RCTResponseSenderBlock)callback)
 {
     LAContext *context = [[LAContext alloc] init];
     NSError *error;
-
+
+    // Check to see if we have a passcode fallback
+    NSNumber *passcodeFallback = [NSNumber numberWithBool:true];
+    if (RCTNilIfNull([options objectForKey:@"passcodeFallback"]) != nil) {
+        passcodeFallback = [RCTConvert NSNumber:options[@"passcodeFallback"]];
+    }
+
     if ([context canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics error:&error]) {
+
+        // No error found, proceed
         callback(@[[NSNull null], [self getBiometryType:context]]);
+    } else if ([passcodeFallback boolValue] && [context canEvaluatePolicy:LAPolicyDeviceOwnerAuthentication error:&error]) {
 
-    } else if ([context canEvaluatePolicy:LAPolicyDeviceOwnerAuthentication error:&error]) {
+        // No error
         callback(@[[NSNull null], [self getBiometryType:context]]);
     }
-    // Device does not support FaceID / TouchID / Pin
+    // Device does not support FaceID / TouchID / Pin OR there was an error!
     else {
+        if (error) {
+            NSString *errorReason = [self getErrorReason:error];
+            NSLog(@"Authentication failed: %@", errorReason);
+
+            callback(@[RCTMakeError(errorReason, nil, nil), [self getBiometryType:context]]);
+            return;
+        }
+
         callback(@[RCTMakeError(@"RCTTouchIDNotSupported", nil, nil)]);
         return;
     }
@@ -33,7 +51,7 @@ @implementation TouchID
     NSError *error;
 
     if (RCTNilIfNull([options objectForKey:@"fallbackLabel"]) != nil) {
-        NSString *fallbackLabel = [RCTConvert NSString:options[@"fallbackLabel"]];   
+        NSString *fallbackLabel = [RCTConvert NSString:options[@"fallbackLabel"]];
         context.localizedFallbackTitle = fallbackLabel;
     }
 
@@ -52,7 +70,7 @@ @implementation TouchID
          }];
 
         // Device does not support TouchID but user wishes to use passcode fallback
-    } else if ([context canEvaluatePolicy:LAPolicyDeviceOwnerAuthentication error:&error] && [passcodeFallback boolValue]) {
+    } else if ([passcodeFallback boolValue] && [context canEvaluatePolicy:LAPolicyDeviceOwnerAuthentication error:&error]) {
         // Attempt Authentification
         [context evaluatePolicy:LAPolicyDeviceOwnerAuthentication
                 localizedReason:reason
@@ -62,6 +80,14 @@ @implementation TouchID
          }];
     }
     else {
+        if (error) {
+            NSString *errorReason = [self getErrorReason:error];
+            NSLog(@"Authentication failed: %@", errorReason);
+
+            callback(@[RCTMakeError(errorReason, nil, nil), [self getBiometryType:context]]);
+            return;
+        }
+
         callback(@[RCTMakeError(@"RCTTouchIDNotSupported", nil, nil)]);
         return;
     }
@@ -71,49 +97,55 @@ - (void)handleAttemptToUseDeviceIDWithSuccess:(BOOL)success error:(NSError *)err
     if (success) { // Authentication Successful
         callback(@[[NSNull null], @"Authenticated with Touch ID."]);
     } else if (error) { // Authentication Error
-        NSString *errorReason;
-
-        switch (error.code) {
-            case LAErrorAuthenticationFailed:
-                errorReason = @"LAErrorAuthenticationFailed";
-                break;
-
-            case LAErrorUserCancel:
-                errorReason = @"LAErrorUserCancel";
-                break;
-
-            case LAErrorUserFallback:
-                errorReason = @"LAErrorUserFallback";
-                break;
-
-            case LAErrorSystemCancel:
-                errorReason = @"LAErrorSystemCancel";
-                break;
-
-            case LAErrorPasscodeNotSet:
-                errorReason = @"LAErrorPasscodeNotSet";
-                break;
-
-            case LAErrorTouchIDNotAvailable:
-                errorReason = @"LAErrorTouchIDNotAvailable";
-                break;
-
-            case LAErrorTouchIDNotEnrolled:
-                errorReason = @"LAErrorTouchIDNotEnrolled";
-                break;
-
-            default:
-                errorReason = @"RCTTouchIDUnknownError";
-                break;
-        }
-
+        NSString *errorReason = [self getErrorReason:error];
         NSLog(@"Authentication failed: %@", errorReason);
         callback(@[RCTMakeError(errorReason, nil, nil)]);
     } else { // Authentication Failure
         callback(@[RCTMakeError(@"LAErrorAuthenticationFailed", nil, nil)]);
     }
 }
 
+- (NSString *)getErrorReason:(NSError *)error
+{
+    NSString *errorReason;
+
+    switch (error.code) {
+        case LAErrorAuthenticationFailed:
+            errorReason = @"LAErrorAuthenticationFailed";
+            break;
+
+        case LAErrorUserCancel:
+            errorReason = @"LAErrorUserCancel";
+            break;
+
+        case LAErrorUserFallback:
+            errorReason = @"LAErrorUserFallback";
+            break;
+
+        case LAErrorSystemCancel:
+            errorReason = @"LAErrorSystemCancel";
+            break;
+
+        case LAErrorPasscodeNotSet:
+            errorReason = @"LAErrorPasscodeNotSet";
+            break;
+
+        case LAErrorTouchIDNotAvailable:
+            errorReason = @"LAErrorTouchIDNotAvailable";
+            break;
+
+        case LAErrorTouchIDNotEnrolled:
+            errorReason = @"LAErrorTouchIDNotEnrolled";
+            break;
+
+        default:
+            errorReason = @"RCTTouchIDUnknownError";
+            break;
+    }
+
+    return errorReason;
+}
+
 - (NSString *)getBiometryType:(LAContext *)context
 {
     if (@available(iOS 11, *)) {