chore(core): updated asyncConfig to use AmplifyOutputs

packages/amplify_core/lib/amplify_core.dart

@@ -19,6 +19,9 @@ export 'src/category/amplify_categories.dart';
 /// Config
 export 'src/config/amplify_config.dart';
 export 'src/config/amplify_outputs/amplify_outputs.dart';
+export 'src/config/amplify_outputs/auth/identity_provider.dart';
+export 'src/config/amplify_outputs/auth/mfa.dart';
+export 'src/config/amplify_outputs/auth/password_policy.dart';
 export 'src/config/amplify_plugin_config.dart' hide UnknownPluginConfigFactory;
 export 'src/config/amplify_plugin_registry.dart';
 export 'src/config/analytics/analytics_config.dart';

packages/amplify_core/lib/src/amplify_class.dart

@@ -62,7 +62,7 @@ abstract class AmplifyClass {
   final AmplifyAuthProviderRepository authProviderRepo =
       AmplifyAuthProviderRepository();
 
-  var _configCompleter = Completer<AmplifyConfig>();
+  var _configCompleter = Completer<AmplifyOutputs>();
   final _addPluginFutures = <Future<void>>[];
 
   /// Adds one plugin at a time. Note: this method can only
@@ -93,7 +93,7 @@ abstract class AmplifyClass {
 
   /// A future when completes when Amplify has been successfully configured.
   @internal
-  Future<AmplifyConfig> get asyncConfig => _configCompleter.future;
+  Future<AmplifyOutputs> get asyncConfig => _configCompleter.future;
 
   /// Configures Amplify with the provided configuration string.
   /// **This method can only be called once**, after all the plugins
@@ -128,7 +128,7 @@ abstract class AmplifyClass {
         );
       }
       await _configurePlugins(amplifyConfig);
-      _configCompleter.complete(amplifyConfig);
+      _configCompleter.complete(amplifyConfig.toAmplifyOutputs());
     } on ConfigurationError catch (e, st) {
       // Complete with the configuration error and reset the completer so
       // that 1) `configure` can be called again and 2) listeners registered
@@ -146,7 +146,7 @@ abstract class AmplifyClass {
       // handled by the developer, but since they are unrelated to
       // configuration, listeners to `Amplify.asyncConfig` should be allowed to
       // proceed with the validated configuration.
-      _configCompleter.complete(amplifyConfig);
+      _configCompleter.complete(amplifyConfig.toAmplifyOutputs());
       _configCompleter = Completer();
       rethrow;
     }

packages/amplify_core/lib/src/config/amplify_outputs/auth/auth_outputs.dart

@@ -2,9 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'package:amplify_core/amplify_core.dart';
-import 'package:amplify_core/src/config/amplify_outputs/auth/mfa.dart';
 import 'package:amplify_core/src/config/amplify_outputs/auth/oauth_outputs.dart';
-import 'package:amplify_core/src/config/amplify_outputs/auth/password_policy.dart';
 import 'package:meta/meta.dart';
 
 part 'auth_outputs.g.dart';

packages/amplify_core/lib/src/config/amplify_outputs/auth/oauth_outputs.dart

@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'package:amplify_core/amplify_core.dart';
-import 'package:amplify_core/src/config/amplify_outputs/auth/identity_provider.dart';
 import 'package:amplify_core/src/config/amplify_outputs/auth/oauth_response_type.dart';
 import 'package:meta/meta.dart';
 

packages/amplify_core/lib/src/config/auth/auth_config.dart

@@ -5,7 +5,6 @@ import 'package:amplify_core/amplify_core.dart';
 import 'package:amplify_core/src/config/amplify_outputs/auth/auth_outputs.dart';
 import 'package:amplify_core/src/config/amplify_outputs/auth/oauth_outputs.dart';
 import 'package:amplify_core/src/config/amplify_outputs/auth/oauth_response_type.dart';
-import 'package:amplify_core/src/config/amplify_outputs/auth/password_policy.dart';
 import 'package:meta/meta.dart';
 
 export 'cognito_config.dart' hide CognitoPluginConfigFactory;

packages/auth/amplify_auth_cognito/example/integration_test/sign_out_test.dart

@@ -51,11 +51,11 @@ void main() {
 
           // ignore: invalid_use_of_internal_member
           final config = await Amplify.asyncConfig;
-          final authConfig = config.auth!.awsPlugin!.cognitoUserPool!.default$!;
+          final authConfig = config.auth!;
           client = AWSHttpClient()
             ..supportedProtocols = SupportedProtocols.http1;
           cognitoClient = cognito_idp.CognitoIdentityProviderClient(
-            region: authConfig.region,
+            region: authConfig.awsRegion,
           );
           addTearDown(client.close);
 

packages/auth/amplify_auth_cognito_dart/example/web/components/app_component.dart

@@ -54,7 +54,7 @@ class AppState {
 /// main app component
 class AppComponent extends StatefulComponent {
   AppState appState = AppState();
-  late AmplifyConfig config;
+  late AmplifyOutputs config;
 
   String? _error;
 
@@ -189,7 +189,7 @@ class AppComponent extends StatefulComponent {
                       );
                     },
                   ),
-                  if (config.auth!.awsPlugin!.auth!.default$!.oAuth != null)
+                  if (config.auth!.oauth != null)
                     ButtonComponent(
                       id: 'hostedUiLogin',
                       innerHtml: 'Login with Hosted UI',

packages/authenticator/amplify_authenticator/lib/amplify_authenticator.dart

@@ -32,6 +32,7 @@ import 'package:amplify_authenticator/src/utils/dial_code.dart';
 import 'package:amplify_authenticator/src/utils/dial_code_options.dart';
 import 'package:amplify_authenticator/src/widgets/authenticator_banner.dart';
 import 'package:amplify_authenticator/src/widgets/form.dart';
+import 'package:amplify_core/amplify_core.dart' as core;
 import 'package:amplify_flutter/amplify_flutter.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -510,7 +511,7 @@ class _AuthenticatorState extends State<Authenticator> {
   late final StreamSubscription<MessageResolverKey> _infoSub;
   late final StreamSubscription<AuthState> _successSub;
 
-  AmplifyConfig? _config;
+  AmplifyOutputs? _config;
   late List<String> _missingConfigValues;
   bool _configInitialized = false;
 
@@ -643,19 +644,19 @@ class _AuthenticatorState extends State<Authenticator> {
     });
   }
 
-  List<String> missingConfigValues(AmplifyConfig? config) {
+  List<String> missingConfigValues(core.AmplifyOutputs? config) {
     final missingValues = <String>[];
-    final cognitoPlugin = config?.auth?.awsPlugin?.auth?.default$;
+    final cognitoPlugin = config?.auth;
     if (cognitoPlugin == null) {
       return const ['auth.plugins.Auth.Default'];
     }
     if (cognitoPlugin.usernameAttributes == null) {
       missingValues.add('usernameAttributes');
     }
-    if (cognitoPlugin.signupAttributes == null) {
+    if (cognitoPlugin.standardRequiredAttributes == null) {
       missingValues.add('signupAttributes');
     }
-    if (cognitoPlugin.passwordProtectionSettings == null) {
+    if (cognitoPlugin.passwordPolicy == null) {
       missingValues.add('passwordProtectionSettings');
     }
     return missingValues;

packages/authenticator/amplify_authenticator/lib/src/mixins/authenticator_username_field.dart

@@ -259,7 +259,7 @@ mixin AuthenticatorUsernameField<FieldType extends Enum,
 mixin UsernameAttributes<T extends AuthenticatorForm>
     on AuthenticatorComponentState<T> {
   late final Set<CognitoUserAttributeKey> usernameAttributes = () {
-    final authConfig = config.amplifyConfig?.auth?.awsPlugin?.auth?.default$;
+    final authConfig = config.amplifyConfig?.auth;
     return <CognitoUserAttributeKey>{...?authConfig?.usernameAttributes};
   }();
 

packages/authenticator/amplify_authenticator/lib/src/services/amplify_auth_service.dart

@@ -68,7 +68,7 @@ abstract class AuthService {
     required CognitoUserAttributeKey userAttributeKey,
     required String confirmationCode,
   });
-  Future<AmplifyConfig> waitForConfiguration();
+  Future<AmplifyOutputs> waitForConfiguration();
 
   Future<void> rememberDevice();
 
@@ -324,7 +324,7 @@ class AmplifyAuthService
   }
 
   @override
-  Future<AmplifyConfig> waitForConfiguration() async {
+  Future<AmplifyOutputs> waitForConfiguration() async {
     final timer = Timer.periodic(const Duration(seconds: 10), (timer) {
       logger.warn(
         'Amplify is taking longer than expected to configure.'

packages/authenticator/amplify_authenticator/lib/src/state/inherited_config.dart

@@ -13,7 +13,7 @@ class InheritedConfig extends InheritedWidget {
     required super.child,
   });
 
-  final AmplifyConfig? amplifyConfig;
+  final AmplifyOutputs? amplifyConfig;
   final EdgeInsets padding;
 
   static InheritedConfig of(BuildContext context) {
@@ -58,7 +58,7 @@ class InheritedConfig extends InheritedWidget {
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
     properties
-      ..add(DiagnosticsProperty<AmplifyConfig?>('config', amplifyConfig))
+      ..add(DiagnosticsProperty<AmplifyOutputs?>('config', amplifyConfig))
       ..add(DiagnosticsProperty<EdgeInsets>('padding', padding));
   }
 }

packages/authenticator/amplify_authenticator/lib/src/utils/validators.dart

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'package:amplify_authenticator/amplify_authenticator.dart';
+import 'package:amplify_core/amplify_core.dart';
 import 'package:amplify_flutter/amplify_flutter.dart';
 import 'package:flutter/material.dart';
 
@@ -73,11 +74,10 @@ extension PasswordPolicyCharactersX on PasswordPolicyCharacters {
 }
 
 FormFieldValidator<String> Function(BuildContext) validateNewPassword({
-  required AmplifyConfig? amplifyConfig,
+  required AmplifyOutputs? amplifyConfig,
   required InputResolver inputResolver,
 }) {
-  final passwordProtectionSettings = amplifyConfig
-      ?.auth?.awsPlugin?.auth?.default$?.passwordProtectionSettings;
+  final passwordPolicies = amplifyConfig?.auth?.passwordPolicy;
   return (BuildContext context) => (String? password) {
         if (password == null || password.isEmpty) {
           return inputResolver.resolve(
@@ -86,23 +86,15 @@ FormFieldValidator<String> Function(BuildContext) validateNewPassword({
           );
         }
         password = password.trim();
-        if (passwordProtectionSettings == null) {
+        if (passwordPolicies == null) {
           return null;
         }
 
-        final unmetReqs = <PasswordPolicyCharacters>[];
-
-        final minLength = passwordProtectionSettings.passwordPolicyMinLength;
+        final minLength = passwordPolicies.minLength;
         final meetsMinLengthRequirement =
             minLength == null || password.length >= minLength;
 
-        final passwordPolicies =
-            passwordProtectionSettings.passwordPolicyCharacters;
-        for (final policy in passwordPolicies) {
-          if (!policy.meetsRequirement(password)) {
-            unmetReqs.add(policy);
-          }
-        }
+        final unmetReqs = _getUnmetPasswordPolicies(password, passwordPolicies);
 
         final error = inputResolver.resolve(
           context,
@@ -118,6 +110,26 @@ FormFieldValidator<String> Function(BuildContext) validateNewPassword({
       };
 }
 
+List<PasswordPolicyCharacters> _getUnmetPasswordPolicies(
+  String password,
+  PasswordPolicy? policy,
+) {
+  final unmetReqs = <PasswordPolicyCharacters>[];
+  if ((policy?.requireLowercase ?? false) && !password.contains(_lowercase)) {
+    unmetReqs.add(PasswordPolicyCharacters.requiresLowercase);
+  }
+  if ((policy?.requireUppercase ?? false) && !password.contains(_uppercase)) {
+    unmetReqs.add(PasswordPolicyCharacters.requiresUppercase);
+  }
+  if ((policy?.requireNumbers ?? false) && !password.contains(_numeric)) {
+    unmetReqs.add(PasswordPolicyCharacters.requiresNumbers);
+  }
+  if ((policy?.requireSymbols ?? false) && !password.contains(_symbols)) {
+    unmetReqs.add(PasswordPolicyCharacters.requiresSymbols);
+  }
+  return unmetReqs;
+}
+
 FormFieldValidator<String> validatePasswordConfirmation(
   String Function() getPassword, {
   required BuildContext context,

packages/authenticator/amplify_authenticator/lib/src/widgets/component.dart

@@ -82,7 +82,7 @@ abstract class AuthenticatorComponentState<T extends StatefulWidget>
         ),
       )
       ..add(
-        DiagnosticsProperty<AmplifyConfig>('config', config.amplifyConfig),
+        DiagnosticsProperty<AmplifyOutputs>('config', config.amplifyConfig),
       );
   }
 }

packages/authenticator/amplify_authenticator/lib/src/widgets/form.dart

@@ -303,15 +303,10 @@ class _SignUpFormState extends AuthenticatorFormState<SignUpForm> {
 
   @override
   List<SignUpFormField> runtimeFields(BuildContext context) {
-    final authConfig = InheritedConfig.of(context)
-        .amplifyConfig
-        ?.auth
-        ?.awsPlugin
-        ?.auth
-        ?.default$;
+    final authConfig = InheritedConfig.of(context).amplifyConfig?.auth;
     final runtimeAttributes = <CognitoUserAttributeKey>{
-      ...?authConfig?.signupAttributes,
-      ...?authConfig?.verificationMechanisms,
+      ...?authConfig?.standardRequiredAttributes,
+      ...?authConfig?.userVerificationTypes,
     };
     if (runtimeAttributes.isEmpty) {
       return const [];
@@ -362,17 +357,17 @@ class _SignUpFormState extends AuthenticatorFormState<SignUpForm> {
         .whereType<SignUpFormField>()
         .toList();
 
-    final hasSmsMfa = authConfig?.mfaTypes?.contains(MfaType.sms) ?? false;
+    final hasSmsMfa = authConfig?.mfaMethods?.contains(MfaMethod.sms) ?? false;
     if (hasSmsMfa && selectedUsernameType != UsernameType.phoneNumber) {
       final mfaConfiguration =
-          authConfig?.mfaConfiguration ?? MfaConfiguration.off;
+          authConfig?.mfaConfiguration ?? MfaEnforcement.off;
       final hasSmsField = runtimeFields.any(
         (f) => f.field == SignUpField.phoneNumber,
       );
-      if (!hasSmsField && mfaConfiguration != MfaConfiguration.off) {
+      if (!hasSmsField && mfaConfiguration != MfaEnforcement.off) {
         runtimeFields.add(
           SignUpFormField.phoneNumber(
-            required: mfaConfiguration == MfaConfiguration.on,
+            required: mfaConfiguration == MfaEnforcement.on,
           ),
         );
       }
@@ -438,19 +433,18 @@ class _SignInFormState extends AuthenticatorFormState<SignInForm> {
     final socialProviders = InheritedConfig.of(context)
         .amplifyConfig
         ?.auth
-        ?.awsPlugin
-        ?.auth
-        ?.default$
-        ?.socialProviders;
+        ?.oauth
+        ?.identityProviders;
+
     if (socialProviders == null || socialProviders.isEmpty) {
       return const [];
     }
 
     // Sort Apple first based off their app guidelines.
     socialProviders.sort((a, b) {
-      if (a == SocialProvider.apple) {
+      if (a == IdentityProvider.apple) {
         return -1;
-      } else if (b == SocialProvider.apple) {
+      } else if (b == IdentityProvider.apple) {
         return 1;
       }
       return a.name.compareTo(b.name);
@@ -460,13 +454,13 @@ class _SignInFormState extends AuthenticatorFormState<SignInForm> {
       SocialSignInButtons(
         providers: socialProviders.map((e) {
           switch (e) {
-            case SocialProvider.facebook:
+            case IdentityProvider.facebook:
               return AuthProvider.facebook;
-            case SocialProvider.google:
+            case IdentityProvider.google:
               return AuthProvider.google;
-            case SocialProvider.amazon:
+            case IdentityProvider.amazon:
               return AuthProvider.amazon;
-            case SocialProvider.apple:
+            case IdentityProvider.apple:
               return AuthProvider.apple;
           }
         }).toList(),