chore: update configure apis to use AmplifyOutputs instead of AmplifyConfig

packages/amplify_core/lib/src/amplify_class.dart

@@ -111,24 +111,12 @@ abstract class AmplifyClass {
             'Check if Amplify is already configured using Amplify.isConfigured.',
       );
     }
-
-    late AmplifyConfig amplifyConfig;
+    late final AmplifyOutputs amplifyOutputs;
     try {
-      try {
-        final json = jsonDecode(configuration) as Map;
-        amplifyConfig = AmplifyConfig.fromJson(json.cast());
-      } on Object catch (e) {
-        throw ConfigurationError(
-          'The provided configuration is not a valid json. '
-          'Check underlyingException.',
-          recoverySuggestion:
-              'Inspect your amplifyconfiguration.dart and ensure that '
-              'the string is proper json',
-          underlyingException: e,
-        );
-      }
-      await _configurePlugins(amplifyConfig);
-      _configCompleter.complete(amplifyConfig.toAmplifyOutputs());
+      final json = _decodeJson(configuration);
+      amplifyOutputs = _parseJsonConfig(json);
+      await _configurePlugins(amplifyOutputs);
+      _configCompleter.complete(amplifyOutputs);
     } 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,14 +134,52 @@ 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.toAmplifyOutputs());
+      _configCompleter.complete(amplifyOutputs);
       _configCompleter = Completer();
       rethrow;
     }
   }
 
+  AmplifyOutputs _parseJsonConfig(Map<String, Object?> json) {
+    try {
+      return AmplifyOutputs.fromJson(json);
+    } on Object {
+      try {
+        final amplifyConfig = AmplifyConfig.fromJson(json);
+        return amplifyConfig.toAmplifyOutputs();
+      } on Object catch (e) {
+        throw ConfigurationError(
+          'The provided configuration can not be decoded to AmplifyOutputs '
+          'or AmplifyConfig. '
+          'Check underlyingException.',
+          recoverySuggestion:
+              'If using Amplify Gen 2 ensure that the json string '
+              'can be decoded to AmplifyOutputs type. '
+              'If using Amplify Gen 1 ensure that the json '
+              'string can be decoded to AmplifyConfig type.',
+          underlyingException: e,
+        );
+      }
+    }
+  }
+
+  Map<String, Object?> _decodeJson(String configuration) {
+    try {
+      return jsonDecode(configuration) as Map<String, Object?>;
+    } on Object catch (e) {
+      throw ConfigurationError(
+        'The provided configuration is not a valid json. '
+        'Check underlyingException.',
+        recoverySuggestion:
+            'Inspect your amplify_outputs.dart or amplifyconfiguration.dart '
+            'and ensure that the string is proper json',
+        underlyingException: e,
+      );
+    }
+  }
+
   /// Configures all plugins in topologically-sorted order.
-  Future<void> _configurePlugins(AmplifyConfig config) async {
+  Future<void> _configurePlugins(AmplifyOutputs config) async {
     await Future.wait(_addPluginFutures);
     _addPluginFutures.clear();
     final categories = <Category, AmplifyCategory>{

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

@@ -55,6 +55,7 @@ class AmplifyOutputs
 
   /// {@macro amplify_core.amplify_outputs.rest_api_outputs}
   @internal
+  @JsonKey(includeToJson: false)
   final Map<String, RestApiOutputs>? restApi;
 
   /// {@macro amplify_core.amplify_outputs.notifications_outputs}
@@ -119,6 +120,6 @@ Object? _dataToJson(Map<String, DataOutputs>? outputs) {
       ' Amplify Outputs does not support multiple GraphQL endpoints.',
     );
   }
-  final data = outputs[_dataPluginName];
+  final data = outputs.values.firstOrNull;
   return data?.toJson();
 }

packages/amplify_core/lib/src/config/auth/cognito/oauth.dart

@@ -2,7 +2,9 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'package:amplify_core/amplify_core.dart';
+import 'package:amplify_core/src/config/amplify_outputs/auth/auth_outputs.dart';
 import 'package:json_annotation/json_annotation.dart';
+import 'package:meta/meta.dart';
 
 part 'oauth.g.dart';
 
@@ -27,6 +29,46 @@ class CognitoOAuthConfig
     this.tokenUriQueryParameters,
   });
 
+  @internal
+  factory CognitoOAuthConfig.fromAuthOutputs(AuthOutputs authOutputs) {
+    if (authOutputs.userPoolClientId == null) {
+      throw ConfigurationError('Invalid config: no User Pool Client Id found.');
+    }
+    if (authOutputs.oauth == null) {
+      throw ConfigurationError('Invalid config: no oAuth configuration found.');
+    }
+
+    final appClientId = authOutputs.userPoolClientId!;
+    final appClientSecret = authOutputs.appClientSecret;
+    final scopes = authOutputs.oauth!.scopes;
+    final signInUri = authOutputs.oauth!.signInUri;
+    final signOutUri = authOutputs.oauth!.signOutUri;
+    final signInUriQueryParameters =
+        authOutputs.oauth!.signInUriQueryParameters;
+    final signOutUriQueryParameters =
+        authOutputs.oauth!.signOutUriQueryParameters;
+    final signInRedirectUri = authOutputs.oauth!.redirectSignInUri.join(',');
+    final signOutRedirectUri = authOutputs.oauth!.redirectSignOutUri.join(',');
+    final webDomain = authOutputs.oauth!.domain;
+    final tokenUri = authOutputs.oauth!.tokenUri;
+    final tokenUriQueryParameters = authOutputs.oauth!.tokenUriQueryParameters;
+
+    return CognitoOAuthConfig(
+      appClientId: appClientId,
+      appClientSecret: appClientSecret,
+      scopes: scopes,
+      signInUri: signInUri,
+      signOutUri: signOutUri,
+      signInRedirectUri: signInRedirectUri,
+      signOutRedirectUri: signOutRedirectUri,
+      webDomain: webDomain,
+      signInUriQueryParameters: signInUriQueryParameters,
+      signOutUriQueryParameters: signOutUriQueryParameters,
+      tokenUri: tokenUri,
+      tokenUriQueryParameters: tokenUriQueryParameters,
+    );
+  }
+
   factory CognitoOAuthConfig.fromJson(Map<String, Object?> json) =>
       _$CognitoOAuthConfigFromJson(json);
 

packages/amplify_core/lib/src/config/auth/cognito/user_pool.dart

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'package:amplify_core/amplify_core.dart';
+import 'package:amplify_core/src/config/amplify_outputs/auth/auth_outputs.dart';
+import 'package:meta/meta.dart';
 
 part 'user_pool.g.dart';
 
@@ -17,6 +19,29 @@ class CognitoUserPoolConfig
     this.endpoint,
   });
 
+  @internal
+  factory CognitoUserPoolConfig.fromAuthOutputs(AuthOutputs authOutputs) {
+    if (authOutputs.userPoolId == null) {
+      throw ConfigurationError(
+        'Invalid Cognito User Pool config: No User Pool Id found',
+      );
+    }
+    if (authOutputs.userPoolClientId == null) {
+      throw ConfigurationError(
+        'Invalid Cognito User Pool config: No User Pool Client Id found',
+      );
+    }
+    return CognitoUserPoolConfig(
+      poolId: authOutputs.userPoolId!,
+      appClientId: authOutputs.userPoolClientId!,
+      appClientSecret: authOutputs.appClientSecret,
+      region: authOutputs.awsRegion,
+      hostedUI: authOutputs.oauth == null
+          ? null
+          : CognitoOAuthConfig.fromAuthOutputs(authOutputs),
+    );
+  }
+
   factory CognitoUserPoolConfig.fromJson(Map<String, Object?> json) =>
       _$CognitoUserPoolConfigFromJson(json);
   final String poolId;

packages/amplify_core/lib/src/plugin/amplify_plugin_interface.dart

@@ -27,7 +27,7 @@ abstract /* base */ class AmplifyPluginInterface {
 
   /// Configures the plugin using the registered [config].
   Future<void> configure({
-    AmplifyConfig? config,
+    AmplifyOutputs? config,
     required AmplifyAuthProviderRepository authProviderRepo,
   }) async {}
 

packages/amplify_core/lib/src/types/notifications/push/service_provider_client.dart

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'package:amplify_core/amplify_core.dart';
+import 'package:amplify_core/src/config/amplify_outputs/notifications/notifications_outputs.dart';
 
 /// {@template amplify_core.push.service_provider_client}
 /// A base class for new service providers to implement and add functionality
@@ -11,7 +12,7 @@ import 'package:amplify_core/amplify_core.dart';
 abstract class ServiceProviderClient {
   /// Initialize this client, used by the plugin during configuration.
   Future<void> init({
-    required NotificationsPinpointPluginConfig config,
+    required NotificationsOutputs config,
     required AmplifyAuthProviderRepository authProviderRepo,
   });
 

packages/amplify_core/test/amplify_class_test.dart

@@ -72,7 +72,7 @@ void main() {
 class ConfigErrorPlugin extends AnalyticsPluginInterface {
   @override
   Future<void> configure({
-    AmplifyConfig? config,
+    AmplifyOutputs? config,
     required AmplifyAuthProviderRepository authProviderRepo,
   }) {
     throw ConfigurationError('Could not configure');
@@ -82,7 +82,7 @@ class ConfigErrorPlugin extends AnalyticsPluginInterface {
 class NonConfigErrorPlugin extends AnalyticsPluginInterface {
   @override
   Future<void> configure({
-    AmplifyConfig? config,
+    AmplifyOutputs? config,
     required AmplifyAuthProviderRepository authProviderRepo,
   }) {
     throw const UnknownException('Could not configure');
@@ -92,7 +92,7 @@ class NonConfigErrorPlugin extends AnalyticsPluginInterface {
 class SuccessPlugin extends AnalyticsPluginInterface {
   @override
   Future<void> configure({
-    AmplifyConfig? config,
+    AmplifyOutputs? config,
     required AmplifyAuthProviderRepository authProviderRepo,
   }) async {
     return;
@@ -107,7 +107,7 @@ class AsyncAddPlugin extends AnalyticsPluginInterface {
 
   @override
   Future<void> configure({
-    AmplifyConfig? config,
+    AmplifyOutputs? config,
     required AmplifyAuthProviderRepository authProviderRepo,
   }) async {
     _configureCompleter.complete();

packages/amplify_core/test/plugin/auth_providers_test.dart

@@ -42,7 +42,7 @@ class AuthPlugin extends Fake implements AuthPluginInterface {
 
   @override
   Future<void> configure({
-    AmplifyConfig? config,
+    AmplifyOutputs? config,
     required AmplifyAuthProviderRepository authProviderRepo,
   }) async {
     _authProvider = authProviderRepo.getAuthProvider(
@@ -72,7 +72,7 @@ class ApiPlugin extends Fake implements APIPluginInterface {
 
   @override
   Future<void> configure({
-    AmplifyConfig? config,
+    AmplifyOutputs? config,
     required AmplifyAuthProviderRepository authProviderRepo,
   }) async {
     _authProvider = authProviderRepo.getAuthProvider(
@@ -83,7 +83,7 @@ class ApiPlugin extends Fake implements APIPluginInterface {
 
 void main() {
   group('AuthProviderRepository', () {
-    test('allows plugin interdependenices', () async {
+    test('allows plugin interdependencies', () async {
       final apiPlugin = ApiPlugin();
       final authPlugin = AuthPlugin();
 

packages/amplify_datastore/android/build.gradle

@@ -73,10 +73,10 @@ android {
 }
 
 dependencies {
-    implementation 'com.amplifyframework:aws-auth-cognito:2.15.0'
-    implementation "com.amplifyframework:aws-api:2.15.0"
-    implementation "com.amplifyframework:aws-datastore:2.15.0"
-    implementation "com.amplifyframework:aws-api-appsync:2.15.0"
+    implementation 'com.amplifyframework:aws-auth-cognito:2.19.1'
+    implementation "com.amplifyframework:aws-api:2.19.1"
+    implementation "com.amplifyframework:aws-datastore:2.19.1"
+    implementation "com.amplifyframework:aws-api-appsync:2.19.1"
     implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1'
 

packages/amplify_datastore/android/src/main/kotlin/com/amazonaws/amplify/amplify_datastore/AmplifyDataStorePlugin.kt

@@ -31,13 +31,15 @@ import com.amazonaws.amplify.amplify_datastore.util.cast
 import com.amazonaws.amplify.amplify_datastore.util.safeCastToList
 import com.amazonaws.amplify.amplify_datastore.util.safeCastToMap
 import com.amplifyframework.AmplifyException
+import com.amplifyframework.annotations.AmplifyFlutterApi
 import com.amplifyframework.api.aws.AWSApiPlugin
 import com.amplifyframework.api.aws.AuthModeStrategyType
 import com.amplifyframework.api.aws.AuthorizationType
 import com.amplifyframework.auth.AuthUser
 import com.amplifyframework.core.Amplify
 import com.amplifyframework.core.AmplifyConfiguration
 import com.amplifyframework.core.async.Cancelable
+import com.amplifyframework.core.configuration.AmplifyOutputs
 import com.amplifyframework.core.model.CustomTypeSchema
 import com.amplifyframework.core.model.Model
 import com.amplifyframework.core.model.ModelSchema
@@ -937,11 +939,9 @@ class AmplifyDataStorePlugin :
     ) {
         coroutineScope.launch(dispatcher) {
             try {
-                val configuration = AmplifyConfiguration.builder(JSONObject(config))
-                    .addPlatform(UserAgent.Platform.FLUTTER, "$version /datastore")
-                    .devMenuEnabled(false)
-                    .build()
-                Amplify.configure(configuration, context)
+                @OptIn(AmplifyFlutterApi::class)
+                Amplify.addUserAgentPlatform(UserAgent.Platform.FLUTTER, "$version /datastore")
+                Amplify.configure(AmplifyOutputs(config), context)
                 withContext(Dispatchers.Main) {
                     callback(kotlin.Result.success(Unit))
                 }

packages/amplify_datastore/ios/Classes/SwiftAmplifyDataStorePlugin.swift

@@ -145,11 +145,9 @@ public class SwiftAmplifyDataStorePlugin: NSObject, FlutterPlugin, NativeAmplify
                     nil
                 )
             }
-            let amplifyConfiguration = try JSONDecoder().decode(AmplifyConfiguration.self,
-                                                                from: data)
             // TODO: Migrate to Async Swift v2
             //            AmplifyAWSServiceConfiguration.addUserAgentPlatform(.flutter, version: "\(version) /datastore")
-            try Amplify.configure(amplifyConfiguration)
+            try Amplify.configure(with : .data(data))
             return completion(.success(()))
         } catch let error as ConfigurationError {
             switch error {

packages/amplify_datastore/lib/amplify_datastore.dart

@@ -50,7 +50,7 @@ class AmplifyDataStore extends DataStorePluginInterface
 
   @override
   Future<void> configure({
-    AmplifyConfig? config,
+    AmplifyOutputs? config,
     required AmplifyAuthProviderRepository authProviderRepo,
   }) async {
     if (config == null) {
@@ -100,15 +100,13 @@ class AmplifyDataStore extends DataStorePluginInterface
     }
 
     final apiPlugin = Amplify.API.plugins.firstOrNull;
-    final gqlConfig = config.api?.awsPlugin?.all.values.firstWhereOrNull(
-      (config) => config.endpointType == EndpointType.graphQL,
-    );
+    final gqlConfig = config.data;
     if (apiPlugin != null && gqlConfig != null) {
       // ignore: invalid_use_of_protected_member
       final authProviders = apiPlugin.authProviders;
       Map<String, String> endpoints = {};
-      config.api?.awsPlugin?.all.entries.forEach((e) {
-        endpoints[e.key] = e.value.authorizationType.name;
+      gqlConfig.entries.forEach((e) {
+        endpoints[e.key] = e.value.defaultAuthorizationType.name;
       });
       final nativePlugin = NativeAmplifyApi(authProviders);
       NativeApiPlugin.setup(nativePlugin);