Skip to content

[local_auth] Migrate iOS to Pigeon #3974

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
auto-submit merged 15 commits into from
May 19, 2023
Merged

[local_auth] Migrate iOS to Pigeon #3974

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
086e8ad
Remove useless check
stuartmorgan-g May 11, 2023
093b0a2
Add todo for incorrect implementation to mark it as staying native
stuartmorgan-g May 11, 2023
5b7888b
Initial Pigeon definition, modified from Android
stuartmorgan-g May 11, 2023
10a3ab4
Adjust native implementation to conform to Pigeon API, adjusting Pige…
stuartmorgan-g May 12, 2023
e6a6a61
Update native tests, add missing test
stuartmorgan-g May 12, 2023
a97c41a
Update Dart implmeentation, modeled on Android
stuartmorgan-g May 12, 2023
ecd6e93
Replace Dart unit tests, based on Android
stuartmorgan-g May 12, 2023
99c2963
Version bump
stuartmorgan-g May 12, 2023
6bd50db
Autoformat
stuartmorgan-g May 12, 2023
830a8df
Typo fix
stuartmorgan-g May 17, 2023
167c018
Merge branch 'main' into local-auth-ios-pigeon
stuartmorgan-g May 18, 2023
9794851
Typo fix
stuartmorgan-g May 18, 2023
99f60e9
Rename result enum field
stuartmorgan-g May 18, 2023
933c0d4
Other review fixes
stuartmorgan-g May 18, 2023
3e707a8
Fix call sites
stuartmorgan-g May 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Other review fixes
  • Loading branch information
@stuartmorgan-g
stuartmorgan-g committed May 18, 2023
commit 933c0d4167b1f5803918bf086dc3b1359a8072e3
26 changes: 13 additions & 13 deletions packages/local_auth/local_auth_ios/ios/Classes/FLTLocalAuthPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#import <LocalAuthentication/LocalAuthentication.h>

typedef void (^AuthCompletion)(FLAAuthResultDetails *_Nullable, FlutterError *_Nullable);
typedef void (^FLAAuthCompletion)(FLAAuthResultDetails *_Nullable, FlutterError *_Nullable);

/**
* A default context factory that wraps standard LAContext allocation.
Expand All @@ -28,16 +28,16 @@ - (LAContext *)createAuthContext {
@interface FLAStickyAuthState : NSObject
@property(nonatomic, strong, nonnull) FLAAuthOptions *options;
@property(nonatomic, strong, nonnull) FLAAuthStrings *strings;
@property(nonatomic, strong, nonnull) AuthCompletion resultHandler;
@property(nonatomic, copy, nonnull) FLAAuthCompletion resultHandler;
- (instancetype)initWithOptions:(nonnull FLAAuthOptions *)options
strings:(nonnull FLAAuthStrings *)strings
resultHandler:(nonnull AuthCompletion)resultHandler;
resultHandler:(nonnull FLAAuthCompletion)resultHandler;
@end

@implementation FLAStickyAuthState
- (instancetype)initWithOptions:(nonnull FLAAuthOptions *)options
strings:(nonnull FLAAuthStrings *)strings
resultHandler:(nonnull AuthCompletion)resultHandler {
resultHandler:(nonnull FLAAuthCompletion)resultHandler {
self = [super init];
if (self) {
_options = options;
Expand Down Expand Up @@ -155,25 +155,25 @@ - (nullable NSNumber *)isDeviceSupportedWithError:
#pragma mark Private Methods

- (void)showAlertWithMessage:(NSString *)message
firstButton:(NSString *)firstButton
additionalButton:(NSString *)secondButton
completion:(AuthCompletion)completion {
dismissButtonTitle:(NSString *)dismissButtonTitle
openSettingsButtonTitle:(NSString *)openSettingsButtonTitle
completion:(FLAAuthCompletion)completion {
UIAlertController *alert =
[UIAlertController alertControllerWithTitle:@""
message:message
preferredStyle:UIAlertControllerStyleAlert];

UIAlertAction *defaultAction = [UIAlertAction actionWithTitle:firstButton
UIAlertAction *defaultAction = [UIAlertAction actionWithTitle:dismissButtonTitle
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *action) {
[self handleSucceeded:NO
withCompletion:completion];
}];

[alert addAction:defaultAction];
if (secondButton != nil) {
if (openSettingsButtonTitle != nil) {
UIAlertAction *additionalAction = [UIAlertAction
actionWithTitle:secondButton
actionWithTitle:openSettingsButtonTitle
style:UIAlertActionStyleDefault
handler:^(UIAlertAction *action) {
NSURL *url = [NSURL URLWithString:UIApplicationOpenSettingsURLString];
Expand All @@ -193,7 +193,7 @@ - (void)handleAuthReplyWithSuccess:(BOOL)success
error:(NSError *)error
options:(FLAAuthOptions *)options
strings:(FLAAuthStrings *)strings
completion:(nonnull AuthCompletion)completion {
completion:(nonnull FLAAuthCompletion)completion {
NSAssert([NSThread isMainThread], @"Response handling must be done on the main thread.");
if (success) {
[self handleSucceeded:YES withCompletion:completion];
Expand Down Expand Up @@ -221,7 +221,7 @@ - (void)handleAuthReplyWithSuccess:(BOOL)success
}
}

- (void)handleSucceeded:(BOOL)succeeded withCompletion:(nonnull AuthCompletion)completion {
- (void)handleSucceeded:(BOOL)succeeded withCompletion:(nonnull FLAAuthCompletion)completion {
completion(
[FLAAuthResultDetails makeWithResult:(succeeded ? FLAAuthResultSuccess : FLAAuthResultFailure)
errorMessage:nil
Expand All @@ -232,7 +232,7 @@ - (void)handleSucceeded:(BOOL)succeeded withCompletion:(nonnull AuthCompletion)c
- (void)handleError:(NSError *)authError
withOptions:(FLAAuthOptions *)options
strings:(FLAAuthStrings *)strings
completion:(nonnull AuthCompletion)completion {
completion:(nonnull FLAAuthCompletion)completion {
FLAAuthResult result = FLAAuthResultErrorNotAvailable;
switch (authError.code) {
case LAErrorPasscodeNotSet:
Expand Down