From fb3c59c3169e96050bd6fa42d09e9123e7ffdd78 Mon Sep 17 00:00:00 2001 From: Nika Hassani Date: Tue, 25 Jun 2024 11:34:52 -0700 Subject: [PATCH] add todo to use AmplifyOutputs config for the unit tests --- .../lib/src/api_plugin_impl.dart | 3 +-- .../test/plugin_configuration_test.dart | 1 + .../test/rest_methods_test.dart | 1 + .../lib/common/mock_config.dart | 2 +- .../amplify_push_notifications_impl_test.dart | 2 ++ .../test/amplify_storage_s3_impl_test.dart | 18 +++++++----------- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/packages/api/amplify_api_dart/lib/src/api_plugin_impl.dart b/packages/api/amplify_api_dart/lib/src/api_plugin_impl.dart index 8cf128dede..36f83e993f 100644 --- a/packages/api/amplify_api_dart/lib/src/api_plugin_impl.dart +++ b/packages/api/amplify_api_dart/lib/src/api_plugin_impl.dart @@ -123,8 +123,7 @@ class AmplifyAPIDart extends APIPluginInterface with AWSDebuggable { _dataConfig?.forEach((key, value) { // Check the presence of apiKey (not auth type) because other modes might // have a key if not the primary auth mode. - if (value.apiKey != null || - value.defaultAuthorizationType == APIAuthorizationType.apiKey || + if (value.defaultAuthorizationType == APIAuthorizationType.apiKey || value.authorizationTypes .any((element) => element == APIAuthorizationType.apiKey)) { _authProviderRepo.registerAuthProvider( diff --git a/packages/api/amplify_api_dart/test/plugin_configuration_test.dart b/packages/api/amplify_api_dart/test/plugin_configuration_test.dart index 97c623eec0..dae096aabe 100644 --- a/packages/api/amplify_api_dart/test/plugin_configuration_test.dart +++ b/packages/api/amplify_api_dart/test/plugin_configuration_test.dart @@ -61,6 +61,7 @@ void main() { APIAuthorizationType.iam.authProviderToken, TestIamAuthProvider(), ); + // TODO(nikahsn): update to use AmplifyOutputs config final config = AmplifyConfig.fromJson( jsonDecode(amplifyconfig) as Map, ); diff --git a/packages/api/amplify_api_dart/test/rest_methods_test.dart b/packages/api/amplify_api_dart/test/rest_methods_test.dart index 44195ce6d1..3d3bad58fd 100644 --- a/packages/api/amplify_api_dart/test/rest_methods_test.dart +++ b/packages/api/amplify_api_dart/test/rest_methods_test.dart @@ -40,6 +40,7 @@ void main() { APIAuthorizationType.iam.authProviderToken, TestIamAuthProvider(), ); + // TODO(nikahsn): update to use AmplifyOutputs config final config = AmplifyConfig.fromJson( jsonDecode(amplifyconfig) as Map, ); diff --git a/packages/auth/amplify_auth_cognito_test/lib/common/mock_config.dart b/packages/auth/amplify_auth_cognito_test/lib/common/mock_config.dart index 249c56efb5..e0ebba2771 100644 --- a/packages/auth/amplify_auth_cognito_test/lib/common/mock_config.dart +++ b/packages/auth/amplify_auth_cognito_test/lib/common/mock_config.dart @@ -25,7 +25,7 @@ const hostedUiConfig = CognitoOAuthConfig( signOutRedirectUri: redirectUri, webDomain: webDomain, ); - +// TODO(nikahsn): update to use AmplifyOutputs config final userPoolOnlyConfig = AmplifyConfig( auth: AuthConfig.cognito( userPoolConfig: const CognitoUserPoolConfig( diff --git a/packages/notifications/push/amplify_push_notifications/test/amplify_push_notifications_impl_test.dart b/packages/notifications/push/amplify_push_notifications/test/amplify_push_notifications_impl_test.dart index 49323b92fc..a170e8e03f 100644 --- a/packages/notifications/push/amplify_push_notifications/test/amplify_push_notifications_impl_test.dart +++ b/packages/notifications/push/amplify_push_notifications/test/amplify_push_notifications_impl_test.dart @@ -54,6 +54,7 @@ void main() { ..addInstance(mockPushNotificationsHostApi) ..addInstance(mockAmplifySecureStorage); + // TODO(nikahsn): update to use AmplifyOutputs config final config = AmplifyConfig.fromJson( jsonDecode(amplifyconfig) as Map, // ignore: invalid_use_of_internal_member @@ -203,6 +204,7 @@ void main() { group('Config failure cases', () { test('should throw exception when configuring if there is no appId present', () async { + // TODO(nikahsn): update to use AmplifyOutputs config final config = AmplifyConfig.fromJson( jsonDecode(noPushAppIdAmplifyConfig) as Map, // ignore: invalid_use_of_internal_member diff --git a/packages/storage/amplify_storage_s3/test/amplify_storage_s3_impl_test.dart b/packages/storage/amplify_storage_s3/test/amplify_storage_s3_impl_test.dart index 418bd4dbdb..8eb798aa9a 100644 --- a/packages/storage/amplify_storage_s3/test/amplify_storage_s3_impl_test.dart +++ b/packages/storage/amplify_storage_s3/test/amplify_storage_s3_impl_test.dart @@ -4,6 +4,7 @@ import 'dart:async'; import 'package:amplify_core/amplify_core.dart'; +import 'package:amplify_core/src/config/amplify_outputs/storage/storage_outputs.dart'; import 'package:amplify_storage_s3/amplify_storage_s3.dart'; import 'package:amplify_storage_s3/src/utils/app_path_provider/app_path_provider.dart'; import 'package:flutter_test/flutter_test.dart'; @@ -12,17 +13,12 @@ import 'test_utils/test_token_provider.dart'; void main() { group('AmplifyStorageS3', () { - final testConfig = const AmplifyConfig( - storage: StorageConfig( - plugins: { - S3PluginConfig.pluginKey: S3PluginConfig( - bucket: '123', - region: 'west-2', - ), - }, - ), - // ignore: invalid_use_of_internal_member - ).toAmplifyOutputs(); + // ignore: invalid_use_of_internal_member + const testConfig = AmplifyOutputs( + version: '1', + storage: StorageOutputs(bucketName: '123', awsRegion: 'west-2'), + ); + // ignore: invalid_use_of_internal_member final testAuthProviderRepo = AmplifyAuthProviderRepository() ..registerAuthProvider( APIAuthorizationType.userPools.authProviderToken,