[local_auth_darwin] MacOS Support

AUTHORS

@@ -74,4 +74,5 @@ Twin Sun, LLC <google-contrib@twinsunsolutions.com>
 Amir Panahandeh <amirpanahandeh@gmail.com>
 Daniele Cambi <dancam.dev@gmail.com>
 Michele Benedetti <michelebenx98@gmail.com>
-Taskulu LDA <contributions@taskulu.com>
+Taskulu LDA <contributions@taskulu.com>
+Alexander Rabin <alex.rabin@sentracam.com>

packages/local_auth/local_auth_darwin/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.3.0
+
+* Adds macOS support.
+
 ## 1.2.2
 
 * Adds compatibility with `intl` 0.19.0.

packages/local_auth/local_auth_darwin/README.md

@@ -1,6 +1,6 @@
 # local_auth_darwin
 
-The iOS implementation of [`local_auth`][1].
+The iOS and macOS implementation of [`local_auth`][1].
 
 ## Usage
 
@@ -12,4 +12,4 @@ However, if you `import` this package to use any of its APIs directly, you
 should add it to your `pubspec.yaml` as usual.
 
 [1]: https://pub.dev/packages/local_auth
-[2]: https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin
+[2]: https://flutter.dev/docs/development/packages-and-plugins/developing-packages#endorsed-federated-plugin

packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin.h

@@ -2,9 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#if TARGET_OS_OSX
+#import <FlutterMacOS/FlutterMacOS.h>
+#else
 #import <Flutter/Flutter.h>
+#endif
 
 #import "messages.g.h"
 
 @interface FLALocalAuthPlugin : NSObject <FlutterPlugin, FLADLocalAuthApi>
+
+- (instancetype)init NS_UNAVAILABLE;
+
+- (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar
+    NS_DESIGNATED_INITIALIZER;
 @end

packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin.m

@@ -18,6 +18,24 @@ - (LAContext *)createAuthContext {
 }
 @end
 
+@interface FLADefaultAlertFactory : NSObject <FLADAlertFactory>
+@end
+
+@implementation FLADefaultAlertFactory
+
+#if TARGET_OS_OSX
+- (NSAlert *)createNSAlert {
+  return [[NSAlert alloc] init];
+}
+#elif TARGET_OS_IOS
+- (UIAlertController *)createUIAlert:(NSString *)message {
+  return [UIAlertController alertControllerWithTitle:@""
+                                             message:message
+                                      preferredStyle:UIAlertControllerStyleAlert];
+}
+#endif
+@end
+
 #pragma mark -
 
 /// A data container for sticky auth state.
@@ -49,24 +67,37 @@ - (instancetype)initWithOptions:(nonnull FLADAuthOptions *)options
 @interface FLALocalAuthPlugin ()
 @property(nonatomic, strong, nullable) FLAStickyAuthState *lastCallState;
 @property(nonatomic, strong) NSObject<FLADAuthContextFactory> *authContextFactory;
+@property(nonatomic, strong) NSObject<FLADAlertFactory> *alertFactory;
+@property(nonatomic, strong) NSObject<FlutterPluginRegistrar> *registrar;
 @end
 
 @implementation FLALocalAuthPlugin
 
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
-  FLALocalAuthPlugin *instance = [[FLALocalAuthPlugin alloc] init];
+  FLALocalAuthPlugin *instance = [[FLALocalAuthPlugin alloc] initWithRegistrar:registrar];
   [registrar addApplicationDelegate:instance];
   SetUpFLADLocalAuthApi([registrar messenger], instance);
 }
 
-- (instancetype)init {
-  return [self initWithContextFactory:[[FLADefaultAuthContextFactory alloc] init]];
+- (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
+  self = [super init];
+  if (self) {
+    _registrar = registrar;
+    _authContextFactory = [[FLADefaultAuthContextFactory alloc] init];
+    _alertFactory = [[FLADefaultAlertFactory alloc] init];
+  }
+  return self;
 }
 
-- (instancetype)initWithContextFactory:(NSObject<FLADAuthContextFactory> *)factory {
+/// Returns an instance that uses the given factory to create LAContexts.
+- (instancetype)initWithContextFactory:(NSObject<FLADAuthContextFactory> *)authFactory
+                          andRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar
+                       andAlertFactory:(NSObject<FLADAlertFactory> *)alertFactory {
   self = [super init];
   if (self) {
-    _authContextFactory = factory;
+    _registrar = registrar;
+    _authContextFactory = authFactory;
+    _alertFactory = alertFactory;
   }
   return self;
 }
@@ -130,9 +161,13 @@ - (nullable NSNumber *)deviceCanSupportBiometricsWithError:
   if ([context canEvaluatePolicy:LAPolicyDeviceOwnerAuthenticationWithBiometrics
                            error:&authError]) {
     if (authError == nil) {
-      if (context.biometryType == LABiometryTypeFaceID) {
-        [biometrics addObject:[FLADAuthBiometricWrapper makeWithValue:FLADAuthBiometricFace]];
-      } else if (context.biometryType == LABiometryTypeTouchID) {
+      if (@available(macOS 10.15, iOS 11.0, *)) {
+        if (context.biometryType == LABiometryTypeFaceID) {
+          [biometrics addObject:[FLADAuthBiometricWrapper makeWithValue:FLADAuthBiometricFace]];
+          return biometrics;
+        }
+      }
+      if (context.biometryType == LABiometryTypeTouchID) {
         [biometrics
             addObject:[FLADAuthBiometricWrapper makeWithValue:FLADAuthBiometricFingerprint]];
       }
@@ -153,10 +188,18 @@ - (void)showAlertWithMessage:(NSString *)message
           dismissButtonTitle:(NSString *)dismissButtonTitle
      openSettingsButtonTitle:(NSString *)openSettingsButtonTitle
                   completion:(FLADAuthCompletion)completion {
-  UIAlertController *alert =
-      [UIAlertController alertControllerWithTitle:@""
-                                          message:message
-                                   preferredStyle:UIAlertControllerStyleAlert];
+#if TARGET_OS_OSX
+  NSAlert *alert = [_alertFactory createNSAlert];
+  [alert setMessageText:message];
+  [alert addButtonWithTitle:dismissButtonTitle];
+  NSWindow *window = self.registrar.view.window;
+  [alert beginSheetModalForWindow:window
+                completionHandler:^(NSModalResponse returnCode) {
+                  [self handleSucceeded:NO withCompletion:completion];
+                }];
+  return;
+#elif TARGET_OS_IOS
+  UIAlertController *alert = [_alertFactory createUIAlert:message];
 
   UIAlertAction *defaultAction = [UIAlertAction actionWithTitle:dismissButtonTitle
                                                           style:UIAlertActionStyleDefault
@@ -182,6 +225,8 @@ - (void)showAlertWithMessage:(NSString *)message
   [[UIApplication sharedApplication].delegate.window.rootViewController presentViewController:alert
                                                                                      animated:YES
                                                                                    completion:nil];
+
+#endif
 }
 
 - (void)handleAuthReplyWithSuccess:(BOOL)success
@@ -257,12 +302,15 @@ - (void)handleError:(NSError *)authError
 
 #pragma mark - AppDelegate
 
+// This method is called when the app is resumed from the background only on iOS
+#if TARGET_OS_IOS
 - (void)applicationDidBecomeActive:(UIApplication *)application {
   if (self.lastCallState != nil) {
     [self authenticateWithOptions:_lastCallState.options
                           strings:_lastCallState.strings
                        completion:_lastCallState.resultHandler];
   }
 }
+#endif
 
 @end

packages/local_auth/local_auth_darwin/darwin/Classes/FLALocalAuthPlugin_Test.h

@@ -2,16 +2,33 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#if TARGET_OS_OSX
+#import <FlutterMacOS/FlutterMacOS.h>
+#else
 #import <Flutter/Flutter.h>
+#endif
+
 #import <LocalAuthentication/LocalAuthentication.h>
 
 /// Protocol for a source of LAContext instances. Used to allow context injection in unit tests.
 @protocol FLADAuthContextFactory <NSObject>
 - (LAContext *)createAuthContext;
 @end
 
+@protocol FLADAlertFactory <NSObject>
+
+#if TARGET_OS_OSX
+- (NSAlert *)createNSAlert;
+#elif TARGET_OS_IOS
+- (UIAlertController *)createUIAlert:(NSString *)message;
+#endif
+
+@end
+
 @interface FLALocalAuthPlugin ()
 /// Returns an instance that uses the given factory to create LAContexts.
-- (instancetype)initWithContextFactory:(NSObject<FLADAuthContextFactory> *)factory
+- (instancetype)initWithContextFactory:(NSObject<FLADAuthContextFactory> *)authFactory
+                          andRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar
+                       andAlertFactory:(NSObject<FLADAlertFactory> *)alertFactory
     NS_DESIGNATED_INITIALIZER;
 @end

packages/local_auth/local_auth_darwin/darwin/Classes/messages.g.h

@@ -58,14 +58,14 @@ typedef NS_ENUM(NSUInteger, FLADAuthBiometric) {
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)makeWithReason:(NSString *)reason
                        lockOut:(NSString *)lockOut
-            goToSettingsButton:(NSString *)goToSettingsButton
-       goToSettingsDescription:(NSString *)goToSettingsDescription
+            goToSettingsButton:(nullable NSString *)goToSettingsButton
+       goToSettingsDescription:(nullable NSString *)goToSettingsDescription
                   cancelButton:(NSString *)cancelButton
         localizedFallbackTitle:(nullable NSString *)localizedFallbackTitle;
 @property(nonatomic, copy) NSString *reason;
 @property(nonatomic, copy) NSString *lockOut;
-@property(nonatomic, copy) NSString *goToSettingsButton;
-@property(nonatomic, copy) NSString *goToSettingsDescription;
+@property(nonatomic, copy, nullable) NSString *goToSettingsButton;
+@property(nonatomic, copy, nullable) NSString *goToSettingsDescription;
 @property(nonatomic, copy) NSString *cancelButton;
 @property(nonatomic, copy, nullable) NSString *localizedFallbackTitle;
 @end

packages/local_auth/local_auth_darwin/darwin/Classes/messages.g.m

@@ -79,8 +79,8 @@ - (NSArray *)toList;
 @implementation FLADAuthStrings
 + (instancetype)makeWithReason:(NSString *)reason
                        lockOut:(NSString *)lockOut
-            goToSettingsButton:(NSString *)goToSettingsButton
-       goToSettingsDescription:(NSString *)goToSettingsDescription
+            goToSettingsButton:(nullable NSString *)goToSettingsButton
+       goToSettingsDescription:(nullable NSString *)goToSettingsDescription
                   cancelButton:(NSString *)cancelButton
         localizedFallbackTitle:(nullable NSString *)localizedFallbackTitle {
   FLADAuthStrings *pigeonResult = [[FLADAuthStrings alloc] init];