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

Show file tree
Hide file tree
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
Typo fix
  • Loading branch information
@stuartmorgan-g
stuartmorgan-g committed May 18, 2023
commit 97948518d5730c62f6784933ae5cfe9524fb3c05
16 changes: 8 additions & 8 deletions packages/local_auth/local_auth_ios/example/ios/RunnerTests/FLTLocalAuthPluginTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ - (void)testSuccessfullAuthWithBiometrics {
XCTestExpectation *expectation = [self expectationWithDescription:@"Result is called"];
[plugin authenticateWithOptions:[FLAAuthOptions makeWithBiometricOnly:@YES
sticky:@NO
useErrorDialgs:@NO]
useErrorDialogs:@NO]
strings:strings
completion:^(FLAAuthResultDetails *_Nullable result,
FlutterError *_Nullable error) {
Expand Down Expand Up @@ -113,7 +113,7 @@ - (void)testSuccessfullAuthWithoutBiometrics {
XCTestExpectation *expectation = [self expectationWithDescription:@"Result is called"];
[plugin authenticateWithOptions:[FLAAuthOptions makeWithBiometricOnly:@NO
sticky:@NO
useErrorDialgs:@NO]
useErrorDialogs:@NO]
strings:strings
completion:^(FLAAuthResultDetails *_Nullable result,
FlutterError *_Nullable error) {
Expand Down Expand Up @@ -151,7 +151,7 @@ - (void)testFailedAuthWithBiometrics {
XCTestExpectation *expectation = [self expectationWithDescription:@"Result is called"];
[plugin authenticateWithOptions:[FLAAuthOptions makeWithBiometricOnly:@YES
sticky:@NO
useErrorDialgs:@NO]
useErrorDialogs:@NO]
strings:strings
completion:^(FLAAuthResultDetails *_Nullable result,
FlutterError *_Nullable error) {
Expand Down Expand Up @@ -193,7 +193,7 @@ - (void)testFailedWithUnknownErrorCode {
XCTestExpectation *expectation = [self expectationWithDescription:@"Result is called"];
[plugin authenticateWithOptions:[FLAAuthOptions makeWithBiometricOnly:@NO
sticky:@NO
useErrorDialgs:@NO]
useErrorDialogs:@NO]
strings:strings
completion:^(FLAAuthResultDetails *_Nullable result,
FlutterError *_Nullable error) {
Expand Down Expand Up @@ -231,7 +231,7 @@ - (void)testSystemCancelledWithoutStickyAuth {
XCTestExpectation *expectation = [self expectationWithDescription:@"Result is called"];
[plugin authenticateWithOptions:[FLAAuthOptions makeWithBiometricOnly:@NO
sticky:@NO
useErrorDialgs:@NO]
useErrorDialogs:@NO]
strings:strings
completion:^(FLAAuthResultDetails *_Nullable result,
FlutterError *_Nullable error) {
Expand Down Expand Up @@ -269,7 +269,7 @@ - (void)testFailedAuthWithoutBiometrics {
XCTestExpectation *expectation = [self expectationWithDescription:@"Result is called"];
[plugin authenticateWithOptions:[FLAAuthOptions makeWithBiometricOnly:@NO
sticky:@NO
useErrorDialgs:@NO]
useErrorDialogs:@NO]
strings:strings
completion:^(FLAAuthResultDetails *_Nullable result,
FlutterError *_Nullable error) {
Expand Down Expand Up @@ -312,7 +312,7 @@ - (void)testLocalizedFallbackTitle {
XCTestExpectation *expectation = [self expectationWithDescription:@"Result is called"];
[plugin authenticateWithOptions:[FLAAuthOptions makeWithBiometricOnly:@NO
sticky:@NO
useErrorDialgs:@NO]
useErrorDialogs:@NO]
strings:strings
completion:^(FLAAuthResultDetails *_Nullable result,
FlutterError *_Nullable error) {
Expand Down Expand Up @@ -350,7 +350,7 @@ - (void)testSkippedLocalizedFallbackTitle {
XCTestExpectation *expectation = [self expectationWithDescription:@"Result is called"];
[plugin authenticateWithOptions:[FLAAuthOptions makeWithBiometricOnly:@NO
sticky:@NO
useErrorDialgs:@NO]
useErrorDialogs:@NO]
strings:strings
completion:^(FLAAuthResultDetails *_Nullable result,
FlutterError *_Nullable error) {
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -237,7 +237,7 @@ - (void)handleError:(NSError *)authError
switch (authError.code) {
case LAErrorPasscodeNotSet:
case LAErrorBiometryNotEnrolled:
if (options.useErrorDialgs.boolValue) {
if (options.useErrorDialogs.boolValue) {
[self showAlertWithMessage:strings.goToSettingsDescription
firstButton:strings.cancelButton
additionalButton:strings.goToSettingsButton
Expand Down
4 changes: 2 additions & 2 deletions packages/local_auth/local_auth_ios/ios/Classes/messages.g.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,10 @@ typedef NS_ENUM(NSUInteger, FLAAuthBiometric) {
- (instancetype)init NS_UNAVAILABLE;
+ (instancetype)makeWithBiometricOnly:(NSNumber *)biometricOnly
sticky:(NSNumber *)sticky
useErrorDialgs:(NSNumber *)useErrorDialgs;
useErrorDialogs:(NSNumber *)useErrorDialogs;
@property(nonatomic, strong) NSNumber *biometricOnly;
@property(nonatomic, strong) NSNumber *sticky;
@property(nonatomic, strong) NSNumber *useErrorDialgs;
@property(nonatomic, strong) NSNumber *useErrorDialogs;
@end

@interface FLAAuthResultDetails : NSObject
Expand Down
10 changes: 5 additions & 5 deletions packages/local_auth/local_auth_ios/ios/Classes/messages.g.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,11 @@ - (NSArray *)toList {
@implementation FLAAuthOptions
+ (instancetype)makeWithBiometricOnly:(NSNumber *)biometricOnly
sticky:(NSNumber *)sticky
useErrorDialgs:(NSNumber *)useErrorDialgs {
useErrorDialogs:(NSNumber *)useErrorDialogs {
FLAAuthOptions *pigeonResult = [[FLAAuthOptions alloc] init];
pigeonResult.biometricOnly = biometricOnly;
pigeonResult.sticky = sticky;
pigeonResult.useErrorDialgs = useErrorDialgs;
pigeonResult.useErrorDialogs = useErrorDialogs;
return pigeonResult;
}
+ (FLAAuthOptions *)fromList:(NSArray *)list {
Expand All @@ -110,8 +110,8 @@ + (FLAAuthOptions *)fromList:(NSArray *)list {
NSAssert(pigeonResult.biometricOnly != nil, @"");
pigeonResult.sticky = GetNullableObjectAtIndex(list, 1);
NSAssert(pigeonResult.sticky != nil, @"");
pigeonResult.useErrorDialgs = GetNullableObjectAtIndex(list, 2);
NSAssert(pigeonResult.useErrorDialgs != nil, @"");
pigeonResult.useErrorDialogs = GetNullableObjectAtIndex(list, 2);
NSAssert(pigeonResult.useErrorDialogs != nil, @"");
return pigeonResult;
}
+ (nullable FLAAuthOptions *)nullableFromList:(NSArray *)list {
Expand All @@ -121,7 +121,7 @@ - (NSArray *)toList {
return @[
(self.biometricOnly ?: [NSNull null]),
(self.sticky ?: [NSNull null]),
(self.useErrorDialgs ?: [NSNull null]),
(self.useErrorDialogs ?: [NSNull null]),
];
}
@end
Expand Down
2 changes: 1 addition & 1 deletion packages/local_auth/local_auth_ios/lib/local_auth_ios.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class LocalAuthIOS extends LocalAuthPlatform {
AuthOptions(
biometricOnly: options.biometricOnly,
sticky: options.stickyAuth,
useErrorDialgs: options.useErrorDialogs),
useErrorDialogs: options.useErrorDialogs),
_pigeonStringsFromAuthMessages(localizedReason, authMessages));
// TODO(stuartmorgan): Replace this with structured errors, coordinated
// across all platform implementations, per
Expand Down
8 changes: 4 additions & 4 deletions packages/local_auth/local_auth_ios/lib/src/messages.g.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,20 +88,20 @@ class AuthOptions {
AuthOptions({
required this.biometricOnly,
required this.sticky,
required this.useErrorDialgs,
required this.useErrorDialogs,
});

bool biometricOnly;

bool sticky;

bool useErrorDialgs;
bool useErrorDialogs;

Object encode() {
return <Object?>[
biometricOnly,
sticky,
useErrorDialgs,
useErrorDialogs,
];
}

Expand All @@ -110,7 +110,7 @@ class AuthOptions {
return AuthOptions(
biometricOnly: result[0]! as bool,
sticky: result[1]! as bool,
useErrorDialgs: result[2]! as bool,
useErrorDialogs: result[2]! as bool,
);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/local_auth/local_auth_ios/pigeons/messages.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ class AuthOptions {
AuthOptions(
{required this.biometricOnly,
required this.sticky,
required this.useErrorDialgs});
required this.useErrorDialogs});
final bool biometricOnly;
final bool sticky;
final bool useErrorDialgs;
final bool useErrorDialogs;
}

class AuthResultDetails {
Expand Down
4 changes: 2 additions & 2 deletions packages/local_auth/local_auth_ios/test/local_auth_ios_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ void main() {
final AuthOptions options = result.captured[0] as AuthOptions;
expect(options.biometricOnly, false);
expect(options.sticky, false);
expect(options.useErrorDialgs, true);
expect(options.useErrorDialogs, true);
});

test('passes provided non-default values', () async {
Expand All @@ -234,7 +234,7 @@ void main() {
final AuthOptions options = result.captured[0] as AuthOptions;
expect(options.biometricOnly, true);
expect(options.sticky, true);
expect(options.useErrorDialgs, false);
expect(options.useErrorDialogs, false);
});
});

Expand Down