From 0a7133617a6d03161875f893a1a187535d235668 Mon Sep 17 00:00:00 2001 From: Dillon Nys Date: Tue, 20 Jun 2023 16:21:37 -0700 Subject: [PATCH] chore(auth): Disable ASF --- .../example/integration_test/main_test.dart | 4 ++-- .../lib/src/auth_plugin_impl.dart | 22 ------------------- .../lib/src/state/cognito_state_machine.dart | 2 -- .../state/machines/sign_in_state_machine.dart | 22 ------------------- .../state/machines/sign_up_state_machine.dart | 20 ----------------- 5 files changed, 2 insertions(+), 68 deletions(-) diff --git a/packages/auth/amplify_auth_cognito/example/integration_test/main_test.dart b/packages/auth/amplify_auth_cognito/example/integration_test/main_test.dart index 164544459b..f2f590e802 100644 --- a/packages/auth/amplify_auth_cognito/example/integration_test/main_test.dart +++ b/packages/auth/amplify_auth_cognito/example/integration_test/main_test.dart @@ -3,7 +3,7 @@ import 'package:flutter_test/flutter_test.dart'; -import 'asf_test.dart' as asf_tests; +// import 'asf_test.dart' as asf_tests; import 'confirm_sign_in_test.dart' as confirm_sign_in_tests; import 'confirm_sign_up_test.dart' as confirm_sign_up_tests; import 'custom_auth_test.dart' as custom_auth_tests; @@ -31,7 +31,7 @@ void main() async { testRunner.setupTests(); group('amplify_auth_cognito', () { - asf_tests.main(); + // asf_tests.main(); confirm_sign_in_tests.main(); confirm_sign_up_tests.main(); custom_auth_tests.main(); diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/auth_plugin_impl.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/auth_plugin_impl.dart index d7b8fecb1d..8e50394c64 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/auth_plugin_impl.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/auth_plugin_impl.dart @@ -34,7 +34,6 @@ import 'package:amplify_auth_cognito_dart/src/sdk/cognito_identity_provider.dart GetUserRequest, ListDevicesRequest, ResendConfirmationCodeRequest, - UserContextDataType, UpdateDeviceStatusRequest, UpdateUserAttributesRequest, VerifyUserAttributeRequest; @@ -140,12 +139,6 @@ class AmplifyAuthCognitoDart extends AuthPluginInterface /// Analytics Metadata Provider AnalyticsMetadataType? get _analyticsMetadata => _stateMachine.get(); - ASFContextDataProvider get _contextDataProvider => stateMachine.getOrCreate(); - - Future _getContextData(String username) async { - return _contextDataProvider.buildRequestData(username); - } - final StreamController _hubEventController = StreamController.broadcast(); @@ -467,7 +460,6 @@ class AmplifyAuthCognitoDart extends AuthPluginInterface pluginOptions: options?.pluginOptions, defaultPluginOptions: const CognitoResendSignUpCodePluginOptions(), ); - final userContextData = await _getContextData(username); final result = await _cognitoIdp.resendConfirmationCode( cognito.ResendConfirmationCodeRequest.build((b) { b @@ -486,10 +478,6 @@ class AmplifyAuthCognitoDart extends AuthPluginInterface final clientMetadata = pluginOptions.clientMetadata; b.clientMetadata.addAll(clientMetadata); - - if (userContextData != null) { - b.userContextData.replace(userContextData); - } }), ).result; @@ -775,7 +763,6 @@ class AmplifyAuthCognitoDart extends AuthPluginInterface pluginOptions: options?.pluginOptions, defaultPluginOptions: const CognitoResetPasswordPluginOptions(), ); - final userContextData = await _getContextData(username); final result = await _cognitoIdp.forgotPassword( cognito.ForgotPasswordRequest.build((b) { b @@ -792,10 +779,6 @@ class AmplifyAuthCognitoDart extends AuthPluginInterface clientSecret, ); } - - if (userContextData != null) { - b.userContextData.replace(userContextData); - } }), ).result; @@ -826,7 +809,6 @@ class AmplifyAuthCognitoDart extends AuthPluginInterface pluginOptions: options?.pluginOptions, defaultPluginOptions: const CognitoConfirmResetPasswordPluginOptions(), ); - final userContextData = await _getContextData(username); await _cognitoIdp.confirmForgotPassword( cognito.ConfirmForgotPasswordRequest.build((b) { b @@ -845,10 +827,6 @@ class AmplifyAuthCognitoDart extends AuthPluginInterface clientSecret, ); } - - if (userContextData != null) { - b.userContextData.replace(userContextData); - } }), ).result; diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/state/cognito_state_machine.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/state/cognito_state_machine.dart index 9e22d83498..c092ade5f4 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/state/cognito_state_machine.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/state/cognito_state_machine.dart @@ -35,8 +35,6 @@ final defaultDependencies = { AuthPluginCredentialsProviderImpl.new, const Token(): DeviceMetadataRepository.fromDependencies, - const Token(): (_) => ASFDeviceInfoCollector(), - const Token(): ASFContextDataProvider.new, }; /// {@template amplify_auth_cognito.cognito_auth_state_machine} diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_in_state_machine.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_in_state_machine.dart index eda87edc73..a17474b350 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_in_state_machine.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_in_state_machine.dart @@ -72,9 +72,6 @@ final class SignInStateMachine /// The Cognito Identity Provider service client. late final CognitoIdentityProviderClient cognitoIdentityProvider = expect(); - /// The advanced security features (ASF) context data provider. - ASFContextDataProvider get contextDataProvider => getOrCreate(); - /// The user built via the auth flow process. var _user = CognitoUserBuilder(); @@ -596,15 +593,6 @@ final class SignInStateMachine } }); - final contextDataProvider = this.contextDataProvider; - final contextData = await contextDataProvider.buildRequestData( - _user.username!, - ); - if (contextData != null) { - initRequest = initRequest.rebuild( - (b) => b.userContextData.replace(contextData), - ); - } final initResponse = await cognitoIdentityProvider.initiateAuth(initRequest).result; @@ -764,12 +752,6 @@ final class SignInStateMachine SignInEvent? event, RespondToAuthChallengeRequest respondRequest, ) async { - UserContextDataType? userContextData; - final contextDataProvider = this.contextDataProvider; - userContextData = await contextDataProvider.buildRequestData( - _user.username!, - ); - respondRequest = respondRequest.rebuild((b) { b ..session ??= _session @@ -786,10 +768,6 @@ final class SignInStateMachine config.appClientSecret!, ); } - - if (userContextData != null) { - b.userContextData.replace(userContextData); - } }); try { diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_up_state_machine.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_up_state_machine.dart index 07865189a5..98bc68db6c 100644 --- a/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_up_state_machine.dart +++ b/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_up_state_machine.dart @@ -42,8 +42,6 @@ final class SignUpStateMachine return userPoolConfig; } - ASFContextDataProvider get _contextDataProvider => getOrCreate(); - @override Future resolve(SignUpEvent event) async { switch (event) { @@ -69,11 +67,6 @@ final class SignUpStateMachine /// State machine callback for the [SignUpInitiate] event. Future onInitiate(SignUpInitiate event) async { - UserContextDataType? contextData; - final contextDataProvider = _contextDataProvider; - contextData = await contextDataProvider.buildRequestData( - event.parameters.username, - ); final resp = await _cognito.signUp( SignUpRequest.build( (b) { @@ -108,10 +101,6 @@ final class SignUpStateMachine clientSecret, ); } - - if (contextData != null) { - b.userContextData.replace(contextData); - } }, ), ).result; @@ -130,11 +119,6 @@ final class SignUpStateMachine /// State machine callback for the [SignUpConfirm] event. Future onConfirm(SignUpConfirm event) async { - UserContextDataType? contextData; - final contextDataProvider = _contextDataProvider; - contextData = await contextDataProvider.buildRequestData( - event.username, - ); await _cognito.confirmSignUp( ConfirmSignUpRequest.build((b) { b @@ -152,10 +136,6 @@ final class SignUpStateMachine clientSecret, ); } - - if (contextData != null) { - b.userContextData.replace(contextData); - } }), ).result;