Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
532ed7f
Beginning of macos support
alexrabin-sentracam Mar 5, 2024
0eb64ee
Merge branch 'flutter:main' into macos-support
alexrabin-sentracam Mar 5, 2024
25ca34e
Made macos deployment target 10.15
alexrabin-sentracam Mar 5, 2024
c57ac02
Merge branch 'macos-support' of https://github.com/alexrabin-sentraca…
alexrabin-sentracam Mar 5, 2024
00bd678
Separate ios and macos code
alexrabin-sentracam Mar 5, 2024
509708f
Adjusted format
alexrabin-sentracam Mar 5, 2024
fd6c539
Updated change log
alexrabin-sentracam Mar 5, 2024
44dd8c8
Removed duplicated analysis_options.yaml
Mar 5, 2024
4f68b52
Removed unnecessary widget_test in darwin
Mar 5, 2024
8646867
Added license blocks in macos example files
Mar 5, 2024
676b0eb
Changed iOSAuthMessages to DarwinAuthMessages
Mar 5, 2024
bcee2e7
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 5, 2024
4aab9d8
Added macos comment
Mar 5, 2024
1bded66
Changed macOS capitalization
Mar 5, 2024
7335837
Removed unnecessary test, added comment, and changed version number
Mar 5, 2024
849c07b
Removed prettier ignore
Mar 5, 2024
c810eb4
Reset upgrade version
Mar 5, 2024
6867b3a
Revert "Changed iOSAuthMessages to DarwinAuthMessages" and add MacOSA…
Mar 5, 2024
995f41d
Changed podspec to use ios deployment_target
Mar 5, 2024
8ab5d09
Checks if macos is 10.15 or higher before checking for faceid
Mar 5, 2024
507470e
Shows correct window for registrar
Mar 5, 2024
05b52ae
Changed wording
Mar 5, 2024
8f35101
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 5, 2024
2b0e6d6
Combined @available statements and renamed keywindow
Mar 6, 2024
c808c82
Created initWithRegistrar initializer
Mar 6, 2024
64bd0b7
Moved runner tests
Mar 6, 2024
7dab5b4
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 6, 2024
7ff9871
Fixed format issues
Mar 6, 2024
04f6a76
Revert "Moved runner tests"
Mar 6, 2024
04c8f12
Fixed tests and platform available check
Mar 6, 2024
64366dd
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 6, 2024
7babc9c
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 7, 2024
b71f172
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 7, 2024
cfabac0
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 8, 2024
5bc080e
Added macos tests
Mar 8, 2024
d794eb9
Fixed format
Mar 8, 2024
74ae648
Added info.plist key and added license heading
Mar 8, 2024
2374375
Added xml language to readme
Mar 8, 2024
f053fce
Upgraded project settings
Mar 8, 2024
04049a3
Reset example macos project
Mar 8, 2024
9be16c3
Fixed macos tests
Mar 8, 2024
ff533bc
Removed settings button on macos due to no native support from Apple …
Mar 8, 2024
783b0cc
Added @available check
Mar 8, 2024
5e9b627
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 11, 2024
1748039
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 11, 2024
ebdb5f1
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 11, 2024
b73254a
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 12, 2024
c4c9f3b
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 12, 2024
6ca1476
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 18, 2024
69db0ec
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 18, 2024
a39e82a
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 19, 2024
59ce98a
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 19, 2024
e54c7ea
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 19, 2024
b8ca53a
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 20, 2024
018fe8f
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 20, 2024
ff38a26
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 21, 2024
e76f6bc
Addressed additional feedback
Mar 25, 2024
72b8212
Fixed plugin tests
Mar 25, 2024
113195e
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 25, 2024
7525f01
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 26, 2024
6330a9e
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 26, 2024
79ebae9
Made initWithRegistrar the designated initializer
Mar 26, 2024
0c84f2b
Merge branch 'macos-support' of https://github.com/alexrabin-sentraca…
Mar 26, 2024
c84a376
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 27, 2024
5dc7c75
Merge branch 'main' into macos-support
alexrabin-sentracam Mar 29, 2024
c33ed13
Merge branch 'main' into macos-support
alexrabin-sentracam Apr 1, 2024
186d89c
Updated messaging
Apr 1, 2024
f9e11db
Merge branch 'main' into macos-support
alexrabin-sentracam Apr 4, 2024
c45084b
Remove gotosettingsbutton on macos and didn't make it required
Apr 4, 2024
7003142
Merge branch 'main' into macos-support
alexrabin-sentracam Apr 9, 2024
18453dc
Merge branch 'main' into macos-support
alexrabin-sentracam Apr 11, 2024
fc14107
Merge branch 'main' into macos-support
alexrabin-sentracam Apr 18, 2024
5840a73
Merge branch 'flutter:main' into macos-support
alexrabin-sentracam Apr 22, 2024
ce1fa37
Merge branch 'main' into macos-support
alexrabin-sentracam Apr 24, 2024
ad83e24
Adjusted format
Apr 24, 2024
8beb6dd
Merge branch 'main' into macos-support
alexrabin-sentracam Apr 24, 2024
067a0c0
Added initWithContextFactoryAndRegistrar since tests failing due to m…
Apr 24, 2024
e3e89d4
Fixed mock test error
Apr 24, 2024
a9167cc
Merge branch 'main' into macos-support
alexrabin-sentracam Apr 25, 2024
0f56ad6
Created base StubAlertFactory
Apr 25, 2024
17bd1c7
Merge branch 'macos-support' of https://github.com/alexrabin-sentraca…
Apr 25, 2024
2441440
Added test to check if the alert window is using the registrar window
Apr 25, 2024
8af7ec7
Added overridemacosmessages
Apr 25, 2024
4fcbc5d
Removes default false for overrideUseMacOSAuthMessages
Apr 25, 2024
8bd0531
Merge branch 'main' into macos-support
alexrabin-sentracam Apr 26, 2024
44e5ae3
Merge branch 'main' into macos-support
alexrabin-sentracam Apr 29, 2024
51b3b02
Merge branch 'main' into macos-support
alexrabin-sentracam Apr 29, 2024
6d0684f
Merge branch 'main' into macos-support
alexrabin-sentracam Apr 29, 2024
ca5789f
Merge branch 'main' into macos-support
alexrabin-sentracam Apr 29, 2024
6d5a0c6
Merge branch 'main' into macos-support
alexrabin-sentracam May 7, 2024
11e6991
Merge branch 'main' into macos-support
alexrabin-sentracam May 8, 2024
316bb68
Updated method names
May 8, 2024
3728490
Fixed comment format
May 8, 2024
5b72aea
Fixed macos tests
May 8, 2024
6dd9092
Merge branch 'main' into macos-support
alexrabin-sentracam May 8, 2024
b5ea028
Merge branch 'main' into macos-support
alexrabin-sentracam May 9, 2024
dd545e5
Merge branch 'main' of https://github.com/flutter/packages into macos…
May 15, 2024
85678af
Upgraded version to 1.4.0
May 15, 2024
679854a
Removed copy property
May 15, 2024
464ae48
Checks parent window correctly and uses nsa;ert object
May 15, 2024
05bc529
Merge branch 'main' into macos-support
alexrabin-sentracam May 16, 2024
d3ce499
Merge branch 'main' into macos-support
alexrabin-sentracam May 20, 2024
57c50d3
Added nonnulll keyword
May 20, 2024
860d198
Updated format
May 20, 2024
9224412
Added nonnull
May 20, 2024
9c345f9
Added non null to create alert
May 20, 2024
71a2824
Merge branch 'main' into macos-support
alexrabin-sentracam May 20, 2024
0d420c5
Updated elif check
May 20, 2024
3415984
Merge branch 'macos-support' of https://github.com/alexrabin-sentraca…
May 20, 2024
09236d6
Added target conditionals import
May 20, 2024
b0de86c
Added declaration comments
May 20, 2024
288b04b
Merge branch 'main' into macos-support
alexrabin-sentracam May 21, 2024
23305d0
Merge remote-tracking branch 'upstream/main' into macos-support
May 29, 2024
2293ff6
Merge branch 'main' into macos-support
alexrabin-sentracam May 29, 2024
46ce252
Merge branch 'main' into macos-support
alexrabin-sentracam May 29, 2024
0f7dac8
Merge branch 'main' into macos-support
alexrabin-sentracam May 29, 2024
a91e4e9
Fixed swift tests
May 30, 2024
e5c9b97
Merge branch 'main' into macos-support
alexrabin-sentracam May 30, 2024
f90387f
Merge branch 'main' into macos-support
alexrabin-sentracam May 30, 2024
9024825
Merge branch 'main' into macos-support
alexrabin-sentracam Jun 17, 2024
91a6d10
Merge branch 'main' into macos-support
alexrabin-sentracam Jun 18, 2024
2b2ebab
Merge branch 'main' into macos-support
stuartmorgan-g Jul 8, 2024
8c9d1d1
License fix
stuartmorgan-g Jul 8, 2024
ee97d66
Group factories in interface
stuartmorgan-g Jul 8, 2024
211bc52
Update tests and implementation to avoid the need for OCMock.
stuartmorgan-g Jul 8, 2024
fabc0d4
Fix alert wrapper creation; tested manually
stuartmorgan-g Jul 31, 2024
568c0ea
Remove OCMock
stuartmorgan-g Jul 31, 2024
371124c
fixup: remove bridging header too
stuartmorgan-g Jul 31, 2024
3b7b5b9
Finish removing OCMock from tests using a view provider protocol, and…
stuartmorgan-g Jul 31, 2024
a6a0019
Minor diff cleanup
stuartmorgan-g Jul 31, 2024
25b6411
Re-add a removed comment, fix naming of macOS default
stuartmorgan-g Jul 31, 2024
5e9af66
Fix constant name in unit test
stuartmorgan Jul 31, 2024
a8a4317
Adjust the ifdef and comment in the test
stuartmorgan-g Aug 1, 2024
c3e81e3
Clean up deployment targets
stuartmorgan-g Aug 1, 2024
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
Added initWithContextFactoryAndRegistrar since tests failing due to m…
…issing context factory
  • Loading branch information
Alex Rabin committed Apr 24, 2024
commit 067a0c0f6b65c0419c57209afb57972fa759af84
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,17 @@ - (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar
return self;
}

/// Returns an instance that uses the given factory to create LAContexts.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Declaration comments only go on the declaration, they should not be copied to the definition.

- (instancetype)initWithContextFactoryAndRegistrar:(NSObject<FLADAuthContextFactory> *)factory
andRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
self = [super init];
if (self) {
_registrar = registrar;
_authContextFactory = factory;
}
return self;
}

#pragma mark FLADLocalAuthApi

- (void)authenticateWithOptions:(nonnull FLADAuthOptions *)options
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

@interface FLALocalAuthPlugin ()
/// Returns an instance that uses the given factory to create LAContexts.
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment needs to be updated to reflect the changes.

- (instancetype)initWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar
- (instancetype)initWithContextFactoryAndRegistrar:(NSObject<FLADAuthContextFactory> *)factory
andRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar
NS_DESIGNATED_INITIALIZER;
@end
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,9 @@ - (void)testDeviceSupportsBiometrics_withNoBiometricHardware {
id mockAuthContext = OCMClassMock([LAContext class]);
id registrar = OCMProtocolMock(@protocol(FlutterPluginRegistrar));

FLALocalAuthPlugin *plugin = [[FLALocalAuthPlugin alloc] initWithRegistrar:registrar];
FLALocalAuthPlugin *plugin =
[[FLALocalAuthPlugin alloc] initWithContextFactoryAndRegistrar:mockAuthContext
andRegistrar:registrar];

const LAPolicy policy = LAPolicyDeviceOwnerAuthenticationWithBiometrics;
void (^canEvaluatePolicyHandler)(NSInvocation *) = ^(NSInvocation *invocation) {
Expand All @@ -434,7 +436,9 @@ - (void)testGetEnrolledBiometricsWithFaceID {
id mockAuthContext = OCMClassMock([LAContext class]);
id registrar = OCMProtocolMock(@protocol(FlutterPluginRegistrar));

FLALocalAuthPlugin *plugin = [[FLALocalAuthPlugin alloc] initWithRegistrar:registrar];
FLALocalAuthPlugin *plugin =
[[FLALocalAuthPlugin alloc] initWithContextFactoryAndRegistrar:mockAuthContext
andRegistrar:registrar];

const LAPolicy policy = LAPolicyDeviceOwnerAuthenticationWithBiometrics;
OCMStub([mockAuthContext canEvaluatePolicy:policy error:[OCMArg setTo:nil]]).andReturn(YES);
Expand All @@ -453,7 +457,9 @@ - (void)testGetEnrolledBiometricsWithTouchID {
id mockAuthContext = OCMClassMock([LAContext class]);
id registrar = OCMProtocolMock(@protocol(FlutterPluginRegistrar));

FLALocalAuthPlugin *plugin = [[FLALocalAuthPlugin alloc] initWithRegistrar:registrar];
FLALocalAuthPlugin *plugin =
[[FLALocalAuthPlugin alloc] initWithContextFactoryAndRegistrar:mockAuthContext
andRegistrar:registrar];

const LAPolicy policy = LAPolicyDeviceOwnerAuthenticationWithBiometrics;
OCMStub([mockAuthContext canEvaluatePolicy:policy error:[OCMArg setTo:nil]]).andReturn(YES);
Expand All @@ -470,7 +476,9 @@ - (void)testGetEnrolledBiometricsWithoutEnrolledHardware {
id mockAuthContext = OCMClassMock([LAContext class]);
id registrar = OCMProtocolMock(@protocol(FlutterPluginRegistrar));

FLALocalAuthPlugin *plugin = [[FLALocalAuthPlugin alloc] initWithRegistrar:registrar];
FLALocalAuthPlugin *plugin =
[[FLALocalAuthPlugin alloc] initWithContextFactoryAndRegistrar:mockAuthContext
andRegistrar:registrar];

const LAPolicy policy = LAPolicyDeviceOwnerAuthenticationWithBiometrics;
void (^canEvaluatePolicyHandler)(NSInvocation *) = ^(NSInvocation *invocation) {
Expand Down Expand Up @@ -500,7 +508,9 @@ - (void)testIsDeviceSupportedHandlesSupported {
.andReturn(YES);
id registrar = OCMProtocolMock(@protocol(FlutterPluginRegistrar));

FLALocalAuthPlugin *plugin = [[FLALocalAuthPlugin alloc] initWithRegistrar:registrar];
FLALocalAuthPlugin *plugin =
[[FLALocalAuthPlugin alloc] initWithContextFactoryAndRegistrar:mockAuthContext
andRegistrar:registrar];

FlutterError *error;
NSNumber *result = [plugin isDeviceSupportedWithError:&error];
Expand All @@ -515,7 +525,9 @@ - (void)testIsDeviceSupportedHandlesUnsupported {
.andReturn(NO);
id registrar = OCMProtocolMock(@protocol(FlutterPluginRegistrar));

FLALocalAuthPlugin *plugin = [[FLALocalAuthPlugin alloc] initWithRegistrar:registrar];
FLALocalAuthPlugin *plugin =
[[FLALocalAuthPlugin alloc] initWithContextFactoryAndRegistrar:mockAuthContext
andRegistrar:registrar];

FlutterError *error;
NSNumber *result = [plugin isDeviceSupportedWithError:&error];
Expand Down