Added a second method so you can now choose between fallback to passcode and a custom one.

Author: EddyVerbruggen

README.md

@@ -35,6 +35,21 @@ Want a nicer guide than these raw code samples? Read [Nic Raboy's blog post abou
 
 ```js
   touchid.verifyFingerprint({
+    message: 'Scan yer finger' // optional, shown in the fingerprint dialog (default: 'Scan your finger').
+  }).then(
+      function() {
+        console.log("Fingerprint was OK");
+      },
+      function(error) {
+        console.log("Fingerprint NOT OK" + (error.code ? ". Code: " + error.code : ""));
+      }
+  )
+```
+
+### function: verifyFingerprintWithCustomFallback
+
+```js
+  touchid.verifyFingerprintWithCustomFallback({
     message: 'Scan yer finger', // optional, shown in the fingerprint dialog (default: 'Scan your finger').
     fallbackMessage: 'Enter PIN' // optional, the button label when scanning fails (default: 'Enter password').
   }).then(
@@ -48,5 +63,6 @@ Want a nicer guide than these raw code samples? Read [Nic Raboy's blog post abou
 ```
 
 ## Changelog
+1.2.0  You can now use the built-in passcode interface as fallback.
 1.1.1  Added TypeScript definitions.
 1.1.0  Added Android platform which will always return false for `touchid.available`.

package.json

@@ -1,12 +1,12 @@
 {
   "name": "nativescript-touchid",
-  "version": "1.1.1",
+  "version": "2.0.0",
   "description": "A TouchID (fingerprint scanner) module for use in NativeScript apps",
   "main": "touchid.js",
   "nativescript": {
     "platforms": {
-      "android": "1.4.0",
-      "ios": "1.4.0"
+      "android": "1.7.0",
+      "ios": "1.7.0"
     }
   },
   "repository": {

touchid.android.js

@@ -8,4 +8,10 @@ exports.verifyFingerprint = function () {
   return new Promise(function (resolve, reject) {
     reject("Not available");
   });
+};
+
+exports.verifyFingerprintWithCustomFallback = function () {
+  return new Promise(function (resolve, reject) {
+    reject("Not available");
+  });
 };

touchid.d.ts

@@ -23,4 +23,5 @@ declare module "nativescript-touchid" {
    * Gets any currently present text from the clipboard.
    */
   export function verifyFingerprint(options: VerifyFingerprintOptions): Promise<string>;
+  export function verifyFingerprintWithCustomFallback(options: VerifyFingerprintOptions): Promise<string>;
 }

touchid.ios.js

@@ -14,13 +14,54 @@ var available = function () {
   });
 };
 
+/**
+ * this 'default' method uses keychain instead of localauth so the passcode fallback can be used
+ */
 var verifyFingerprint = function (arg) {
+  return new Promise(function (resolve, reject) {
+    try {
+
+      if (keychainItemServiceName === null) {
+        var bundleID = NSBundle.mainBundle().infoDictionary.objectForKey("CFBundleIdentifier");
+        keychainItemServiceName = bundleID + ".TouchID";
+      }
+
+      if (!createKeyChainEntry()) {
+        verifyFingerprint(arg);
+      } else {
+        var message = arg !== null && arg.message || "Scan your finger";
+        var query = NSMutableDictionary.alloc().init();
+        query.setObjectForKey(kSecClassGenericPassword, kSecClass);
+        query.setObjectForKey(keychainItemIdentifier, kSecAttrAccount);
+        query.setObjectForKey(keychainItemServiceName, kSecAttrService);
+        query.setObjectForKey(message, kSecUseOperationPrompt);
+
+        // Start the query and the fingerprint scan and/or device passcode validation
+        var res = SecItemCopyMatching(query, null);
+        if (res === 0) { // 0 = ok (match, not canceled)
+          resolve();
+        } else {
+          reject(res);
+        }
+      }
+
+    } catch (ex) {
+      console.log("Error in touchid.verifyFingerprint: " + ex);
+      reject(ex);
+    }
+  });
+};
+
+/**
+ * This implementation uses LocalAuthentication and has no built-in passcode fallback
+ */
+var verifyFingerprintWithCustomFallback = function (arg) {
   return new Promise(function (resolve, reject) {
     try {
       var laContext = LAContext.alloc().init();
       if (laContext.canEvaluatePolicyError(LAPolicyDeviceOwnerAuthenticationWithBiometrics, null)) {
-        var message = arg != null && arg.message || "Scan your finger";
-        if (arg != null && arg.fallbackMessage) {
+        var message = arg !== null && arg.message || "Scan your finger";
+        if (arg !== null && arg.fallbackMessage) {
           laContext.localizedFallbackTitle = arg.fallbackMessage;
         }
         laContext.evaluatePolicyLocalizedReasonReply(
@@ -44,46 +85,6 @@ var verifyFingerprint = function (arg) {
   });
 };
 
-var verifyFingerprintWithPasscodeFallback = function (arg) {
-  return new Promise(function (resolve, reject) {
-    try {
-
-      if (keychainItemServiceName == null) {
-        var bundleID = NSBundle.mainBundle().infoDictionary.objectForKey("CFBundleIdentifier");
-        keychainItemServiceName = bundleID + ".TouchID";
-        console.log("---- keychainItemServiceName " + keychainItemServiceName);
-      }
-
-      if (!createKeyChainEntry()) {
-        console.log("Keychain trouble. Falling back to verifyFingerprintWithCustomPasswordFallback.");
-        verifyFingerprintWithCustomPasswordFallback(arg);
-      } else {
-
-        var message = arg != null && arg.message || "Scan your finger";
-        console.log("message: " + message);
-
-        var query = NSMutableDictionary.alloc().init();
-        query.setObjectForKey(kSecClassGenericPassword, kSecClass);
-        query.setObjectForKey(keychainItemIdentifier, kSecAttrAccount);
-        query.setObjectForKey(keychainItemServiceName, kSecAttrService);
-        query.setObjectForKey(message, kSecUseOperationPrompt);
-
-        console.log("query: " + query);
-
-        // Start the query and the fingerprint scan and/or device passcode validation
-        var res = SecItemCopyMatching(query, null);
-        console.log("res: " + res); // 0 = noErr
-        resolve(res == noErr);
-      }
-      //}
-
-    } catch (ex) {
-      console.log("Error in touchid.verifyFingerprint: " + ex);
-      reject(ex);
-    }
-  });
-};
-
 var createKeyChainEntry = function () {
   var attributes = NSMutableDictionary.alloc().init();
   attributes.setObjectForKey(kSecClassGenericPassword, kSecClass);
@@ -97,7 +98,7 @@ var createKeyChainEntry = function () {
       kSecAccessControlUserPresence,
       null
   );
-  if (accessControlRef == null) {
+  if (accessControlRef === null) {
     console.log("Can't store identifier '" + keychainItemIdentifier + "' in the KeyChain: " + accessControlError + ".");
     return false;
   } else {
@@ -117,4 +118,4 @@ var createKeyChainEntry = function () {
 
 exports.available = available;
 exports.verifyFingerprint = verifyFingerprint;
-exports.verifyFingerprintWithPasscodeFallback = verifyFingerprintWithPasscodeFallback;
+exports.verifyFingerprintWithCustomFallback = verifyFingerprintWithCustomFallback;