Skip to content

Commit 8d17f90

Browse files
properly resolve the promise when invoking the fallback function
1 parent 6fd4a8f commit 8d17f90

File tree

1 file changed

+17
-15
lines changed

1 file changed

+17
-15
lines changed

touchid.ios.js

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,26 +23,28 @@ var verifyFingerprint = function (arg) {
2323

2424
if (keychainItemServiceName === null) {
2525
var bundleID = NSBundle.mainBundle().infoDictionary.objectForKey("CFBundleIdentifier");
26+
console.log(bundleID);
2627
keychainItemServiceName = bundleID + ".TouchID";
2728
}
2829

2930
if (!createKeyChainEntry()) {
30-
verifyFingerprintWithCustomFallback(arg);
31-
} else {
32-
var message = arg !== null && arg.message || "Scan your finger";
33-
var query = NSMutableDictionary.alloc().init();
34-
query.setObjectForKey(kSecClassGenericPassword, kSecClass);
35-
query.setObjectForKey(keychainItemIdentifier, kSecAttrAccount);
36-
query.setObjectForKey(keychainItemServiceName, kSecAttrService);
37-
query.setObjectForKey(message, kSecUseOperationPrompt);
31+
verifyFingerprintWithCustomFallback(arg).then(resolve, reject);
32+
return;
33+
}
3834

39-
// Start the query and the fingerprint scan and/or device passcode validation
40-
var res = SecItemCopyMatching(query, null);
41-
if (res === 0) { // 0 = ok (match, not canceled)
42-
resolve();
43-
} else {
44-
reject(res);
45-
}
35+
var message = arg !== null && arg.message || "Scan your finger";
36+
var query = NSMutableDictionary.alloc().init();
37+
query.setObjectForKey(kSecClassGenericPassword, kSecClass);
38+
query.setObjectForKey(keychainItemIdentifier, kSecAttrAccount);
39+
query.setObjectForKey(keychainItemServiceName, kSecAttrService);
40+
query.setObjectForKey(message, kSecUseOperationPrompt);
41+
42+
// Start the query and the fingerprint scan and/or device passcode validation
43+
var res = SecItemCopyMatching(query, null);
44+
if (res === 0) { // 0 = ok (match, not canceled)
45+
resolve();
46+
} else {
47+
reject(res);
4648
}
4749

4850
} catch (ex) {

0 commit comments

Comments
 (0)