Merge remote-tracking branch 'origin/master'

Author: mCodex

index.d.ts

@@ -62,4 +62,4 @@ export declare function isSensorAvailable(): Promise<
 export declare function isHardwareDetected(): Promise<boolean>;
 export declare function hasEnrolledFingerprints(): Promise<boolean>;
 export declare function cancelFingerprintAuth(): void;
-export declare function setInvalidatedByBiometricEnrollment(boolean): void;
+export declare function setInvalidatedByBiometricEnrollment(set: boolean): void;

ios/RNSensitiveInfo/RNSensitiveInfo.m

@@ -144,63 +144,95 @@ - (NSString *)messageForError:(NSError *)error
 }
 
 RCT_EXPORT_METHOD(getItem:(NSString *)key options:(NSDictionary *)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject){
-
-
+    
+    
     NSString * keychainService = [RCTConvert NSString:options[@"keychainService"]];
     if (keychainService == NULL) {
         keychainService = @"app";
     }
+    
+    // Create dictionary of search parameters
+    NSMutableDictionary* query = [NSMutableDictionary dictionaryWithObjectsAndKeys:(__bridge id)(kSecClassGenericPassword), kSecClass,
+                                  keychainService, kSecAttrService,
+                                  key, kSecAttrAccount,
+                                  kCFBooleanTrue, kSecReturnAttributes,
+                                  kCFBooleanTrue, kSecReturnData,
+                                  nil];
+    
+    if([RCTConvert NSString:options[@"kSecUseOperationPrompt"]] != NULL){
+        [query setValue:[RCTConvert NSString:options[@"kSecUseOperationPrompt"]] forKey:(NSString *)kSecUseOperationPrompt];
+    }
+    
+    if([RCTConvert BOOL:options[@"touchID"]]){
+        LAContext *context = [[LAContext alloc] init];
+        context.localizedFallbackTitle = @"";
+        context.touchIDAuthenticationAllowableReuseDuration = 1;
+        
+        [query setValue:context forKey:(NSString *)kSecUseAuthenticationContext];
+        
+        NSString *prompt = @"";
+        if ([RCTConvert NSString:options[@"kSecUseOperationPrompt"]] != NULL) {
+            prompt = [RCTConvert NSString:options[@"kSecUseOperationPrompt"]];
+        }
+        
+        [context evaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics
+                localizedReason:prompt
+                          reply:^(BOOL success, NSError * _Nullable error) {
+                              if (!success) {
+                                  if (error) {
+                                      reject(nil, error.localizedDescription, error);
+                                  } else {
+                                      reject(nil, @"The user name or passphrase you entered is not correct.", nil);
+                                  }
+                                  return;
+                              }
+                              
+                              [self getItemWithQuery:query resolver:resolve rejecter:reject];
+                          }];
+        return;
+    }
+    
+    [self getItemWithQuery:query resolver:resolve rejecter:reject];
+}
 
-  // Create dictionary of search parameters
-  NSMutableDictionary* query = [NSMutableDictionary dictionaryWithObjectsAndKeys:(__bridge id)(kSecClassGenericPassword), kSecClass,
-                        keychainService, kSecAttrService,
-                        key, kSecAttrAccount,
-                        kCFBooleanTrue, kSecReturnAttributes,
-                        kCFBooleanTrue, kSecReturnData,
-                        nil];
-
-  if([RCTConvert NSString:options[@"kSecUseOperationPrompt"]] != NULL){
-    [query setValue:[RCTConvert NSString:options[@"kSecUseOperationPrompt"]] forKey:(NSString *)kSecUseOperationPrompt];
-  }
-
-  // Look up server in the keychain
-  NSDictionary* found = nil;
-  CFTypeRef foundTypeRef = NULL;
-  OSStatus osStatus = SecItemCopyMatching((__bridge CFDictionaryRef) query, (CFTypeRef*)&foundTypeRef);
-
-  if (osStatus != noErr && osStatus != errSecItemNotFound) {
-    NSError *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:osStatus userInfo:nil];
-    reject([NSString stringWithFormat:@"%ld",(long)error.code], [self messageForError:error], nil);
-    return;
-  }
-
-  found = (__bridge NSDictionary*)(foundTypeRef);
-  if (!found) {
-      resolve(nil);
-  } else {
-      // Found
-      NSString* value = [[NSString alloc] initWithData:[found objectForKey:(__bridge id)(kSecValueData)] encoding:NSUTF8StringEncoding];
-      resolve(value);
-
-  }
-
+- (void)getItemWithQuery:(NSDictionary *)query resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
+    // Look up server in the keychain
+    NSDictionary* found = nil;
+    CFTypeRef foundTypeRef = NULL;
+    OSStatus osStatus = SecItemCopyMatching((__bridge CFDictionaryRef) query, (CFTypeRef*)&foundTypeRef);
+    
+    if (osStatus != noErr && osStatus != errSecItemNotFound) {
+        NSError *error = [NSError errorWithDomain:NSOSStatusErrorDomain code:osStatus userInfo:nil];
+        reject([NSString stringWithFormat:@"%ld",(long)error.code], [self messageForError:error], nil);
+        return;
+    }
+    
+    found = (__bridge NSDictionary*)(foundTypeRef);
+    if (!found) {
+        resolve(nil);
+    } else {
+        // Found
+        NSString* value = [[NSString alloc] initWithData:[found objectForKey:(__bridge id)(kSecValueData)] encoding:NSUTF8StringEncoding];
+        resolve(value);
+        
+    }
 }
 
 RCT_EXPORT_METHOD(getAllItems:(NSDictionary *)options resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject){
-
+    
     NSString * keychainService = [RCTConvert NSString:options[@"keychainService"]];
-
+    
     NSMutableArray* finalResult = [[NSMutableArray alloc] init];
     NSMutableDictionary *query = [NSMutableDictionary dictionaryWithObjectsAndKeys:
                                   (__bridge id)kCFBooleanTrue, (__bridge id)kSecReturnAttributes,
                                   (__bridge id)kSecMatchLimitAll, (__bridge id)kSecMatchLimit,
                                   (__bridge id)kCFBooleanTrue, (__bridge id)kSecReturnData,
                                   nil];
-
+    
     if (keychainService) {
         [query setObject:keychainService forKey:(NSString *)kSecAttrService];
     }
-
+    
     NSArray *secItemClasses = [NSArray arrayWithObjects:
                                (__bridge id)kSecClassGenericPassword,
                                (__bridge id)kSecClassInternetPassword,
@@ -272,15 +304,19 @@ - (NSString *)messageForError:(NSError *)error
 {
 #if !TARGET_OS_TV
     LAContext *context = [[LAContext alloc] init];
-
-    if ([context canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics error:NULL]) {
+    
+    NSError *evaluationError = nil;
+    if ([context canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics error:&evaluationError]) {
         if (@available(iOS 11, macOS 10.13.2, *)) {
             if (context.biometryType == LABiometryTypeFaceID) {
                 return resolve(@"Face ID");
             }
         }
         resolve(@"Touch ID");
     } else {
+        if (evaluationError && evaluationError.code == LAErrorBiometryLockout) {
+            return reject(nil, @"Biometry is locked", nil);
+        }
         resolve(@(NO));
     }
 #else

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-sensitive-info",
-  "version": "5.4.0",
+  "version": "5.4.1",
   "main": "RNSensitiveInfo.js",
   "description": "react-native-sensitive-info manages all data stored in Android Shared Preferences and iOS Keychain. You can set, get and delete keys/values using simple methods.",
   "scripts": {