feat: Adding a hasItem method (#259)

* fix: added a has-item method

* fix: example cleanup

Author: denissb

android/src/main/java/dev/mcodex/RNSensitiveInfoModule.java

@@ -195,6 +195,15 @@ public void getItem(String key, ReadableMap options, Promise pm) {
         }
     }
 
+    @ReactMethod
+    public void hasItem(String key, ReadableMap options, Promise pm) {
+        String name = sharedPreferences(options);
+
+        String value = prefs(name).getString(key, null);
+
+        pm.resolve(value != null ? true : false);
+    }
+
     @ReactMethod
     public void setItem(String key, String value, ReadableMap options, Promise pm) {
 

example/src/pages/Home/index.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from 'react';
-import { View, Button, Alert, Text } from 'react-native';
+import { View, Button, Alert, Text, SafeAreaView } from 'react-native';
 import SInfo from 'react-native-sensitive-info';
 
 const Home: React.FC = () => {
@@ -45,6 +45,27 @@ const Home: React.FC = () => {
     }
   }, []);
 
+  const hasTouchIDItem = useCallback(async () => {
+
+    try {
+      const hasItem = await SInfo.hasItem(
+        'touchIdItem',
+        {
+          sharedPreferencesName: 'exampleApp',
+          keychainService: 'exampleApp',
+          kSecAccessControl: 'kSecAccessControlBiometryAny', // Enabling FaceID
+          touchID: true,
+          showModal: true,
+        },
+      );
+
+      Alert.alert(hasItem ? "Item is present" : "item is not present");
+    } catch (ex) {
+      Alert.alert('Error', ex.message);
+    }
+  }, []);
+
+
   const getTouchIDItem = useCallback(async () => {
     const deviceHasSensor = await SInfo.isSensorAvailable();
 
@@ -94,7 +115,7 @@ const Home: React.FC = () => {
   runTest();
 
   return (
-    <View>
+    <SafeAreaView style={{ margin: 10 }}>
       <Button
         title="Add item using setItem"
         onPress={handleAddUsingSetItemOnPress}
@@ -109,9 +130,10 @@ const Home: React.FC = () => {
       />
 
       <Button title="Get TouchID Data" onPress={getTouchIDItem} />
+      <Button title="Has TouchID Data" onPress={hasTouchIDItem} />
 
       <Text>{logText}</Text>
-    </View>
+    </SafeAreaView>
   );
 };
 export default Home;

index.d.ts

@@ -51,6 +51,10 @@ export declare function getItem(
   key: string,
   options: RNSensitiveInfoOptions,
 ): Promise<string>;
+export declare function hasItem(
+  key: string,
+  options: RNSensitiveInfoOptions,
+): Promise<boolean>;
 
 interface SensitiveInfoEntry {
   key: string;

ios/RNSensitiveInfo.xcodeproj/project.xcworkspace/xcuserdata/denissborisovs.xcuserdatad/UserInterfaceState.xcuserstate

@@ -226,6 +226,51 @@ - (NSString *)messageForError:(NSError *)error
     });
 }
 
+RCT_EXPORT_METHOD(hasItem:(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,
+                                  kSecAttrSynchronizableAny, kSecAttrSynchronizable,
+                                  kCFBooleanTrue, kSecReturnAttributes,
+                                  kCFBooleanTrue, kSecReturnData,
+                                  nil];
+
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        if (UIApplication.sharedApplication.protectedDataAvailable) {
+            // 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(@(FALSE));
+            } else {
+                // Found
+                resolve(@(TRUE));
+            }
+        } else {
+            // TODO: could change to instead of erroring out, listen for protectedDataDidBecomeAvailable and call getItemWIthQuery when it does
+            // Experiment for now by returning an error and let the js side retry
+            reject(@"protected_data_unavailable", @"Protected data not available yet. Retry operation", nil);
+        }
+    });
+}
+
+
 - (void)getItemWithQuery:(NSDictionary *)query resolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject {
     // Look up server in the keychain
     NSDictionary* found = nil;
@@ -245,7 +290,6 @@ - (void)getItemWithQuery:(NSDictionary *)query resolver:(RCTPromiseResolveBlock)
         // Found
         NSString* value = [[NSString alloc] initWithData:[found objectForKey:(__bridge id)(kSecValueData)] encoding:NSUTF8StringEncoding];
         resolve(value);
-        
     }
 }