chore: cleanup some logic

codebytere · Jun 4, 2024 · d7aea5a · d7aea5a
1 parent 0d2c32e
commit d7aea5a
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 50 deletions.
diff --git a/auth.mm b/auth.mm
@@ -44,51 +44,44 @@
   Napi::ThreadSafeFunction ts_fn = Napi::ThreadSafeFunction::New(
       env, Napi::Function::New(env, NoOp), "authCallback", 0, 1);
 
-  if (@available(macOS 10.12.2, *)) {
-
-    LAContext *context = [[LAContext alloc] init];
-
-    // The app-provided reason for requesting authentication
-    NSString *request_reason = [NSString stringWithUTF8String:reason.c_str()];
-
-    // Authenticate with biometry.
-    LAPolicy policy = LAPolicyDeviceOwnerAuthenticationWithBiometrics;
-
-    // Optionally set the duration for which Touch ID authentication reuse is
-    // allowable
-    if (reuse_duration > 0)
-      [context setTouchIDAuthenticationAllowableReuseDuration:reuse_duration];
-
-    __block Napi::ThreadSafeFunction tsfn = ts_fn;
-    [context
-         evaluatePolicy:policy
-        localizedReason:request_reason
-                  reply:^(BOOL success, NSError *error) {
-                    // Promise resolution callback
-                    auto resolve_cb = [=](Napi::Env env,
-                                          Napi::Function noop_cb) {
-                      deferred.Resolve(env.Null());
-                    };
-
-                    // Promise rejection callback
-                    auto reject_cb = [=](Napi::Env env, Napi::Function noop_cb,
-                                         const char *error) {
-                      deferred.Reject(Napi::String::New(env, error));
-                    };
-
-                    if (error) {
-                      const char *err_str =
-                          [error.localizedDescription UTF8String];
-                      tsfn.BlockingCall(err_str, reject_cb);
-                    } else {
-                      tsfn.BlockingCall(resolve_cb);
-                    };
-                    tsfn.Release();
-                  }];
-  } else {
-    ts_fn.Release();
-    deferred.Resolve(env.Null());
-  }
+  LAContext *context = [[LAContext alloc] init];
+
+  // The app-provided reason for requesting authentication
+  NSString *request_reason = [NSString stringWithUTF8String:reason.c_str()];
+
+  // Authenticate with biometry.
+  LAPolicy policy = LAPolicyDeviceOwnerAuthenticationWithBiometrics;
+
+  // Optionally set the duration for which Touch ID authentication reuse is
+  // allowable
+  if (reuse_duration > 0)
+    [context setTouchIDAuthenticationAllowableReuseDuration:reuse_duration];
+
+  __block Napi::ThreadSafeFunction tsfn = ts_fn;
+  [context
+       evaluatePolicy:policy
+      localizedReason:request_reason
+                reply:^(BOOL success, NSError *error) {
+                  // Promise resolution callback
+                  auto resolve_cb = [=](Napi::Env env, Napi::Function noop_cb) {
+                    deferred.Resolve(env.Null());
+                  };
+
+                  // Promise rejection callback
+                  auto reject_cb = [=](Napi::Env env, Napi::Function noop_cb,
+                                       const char *error) {
+                    deferred.Reject(Napi::String::New(env, error));
+                  };
+
+                  if (error) {
+                    const char *err_str =
+                        [error.localizedDescription UTF8String];
+                    tsfn.BlockingCall(err_str, reject_cb);
+                  } else {
+                    tsfn.BlockingCall(resolve_cb);
+                  };
+                  tsfn.Release();
+                }];
 
   return deferred.Promise();
 }

diff --git a/index.js b/index.js
@@ -1,7 +1,7 @@
 const auth = require('bindings')('auth.node')
 
 function promptTouchID(options) {
-  if (!options) {
+  if (!options || typeof options !== 'object') {
     throw new Error('Options object is required.')
   }
 

diff --git a/test/module.spec.js b/test/module.spec.js
@@ -4,7 +4,9 @@ const { promptTouchID, canPromptTouchID } = require('../index')
 describe('node-mac-auth', () => {
   describe('canPromptTouchID()', () => {
     it('should not throw', () => {
-      expect(() => { canPromptTouchID() }).to.not.throw()
+      expect(() => {
+        canPromptTouchID()
+      }).to.not.throw()
     })
 
     it('should return a boolean', () => {
@@ -23,15 +25,21 @@ describe('node-mac-auth', () => {
     it('should throw if no reason is passed', () => {
       expect(() => {
         promptTouchID({})
-      }).to.throw(/Reason parameter is required./)
+      }).to.throw(/Reason parameter must be a string./)
     })
 
     it('should throw if reason is not a string', () => {
       expect(() => {
         promptTouchID({ reason: 1 })
       }).to.throw(/Reason parameter must be a string./)
     })
-
+
+    it('should throw if reuseDuration is not a number', () => {
+      expect(() => {
+        promptTouchID({ reason: 'i want to', reuseDuration: 'not-a-number' })
+      }).to.throw(/reuseDuration parameter must be a number./)
+    })
+
     it('should not throw if no reuseDuration is passed', () => {
       expect(() => {
         promptTouchID({ reason: 'i want to' }, () => {})
@@ -41,4 +49,4 @@ describe('node-mac-auth', () => {
       process.exit(0)
     })
   })
-})
+})