chore!: Migrate core (#1599)

commit-id:59b50639

Author: dnys1

.circleci/config.yml

@@ -228,10 +228,8 @@ workflows:
                   "amplify_authenticator",
                   "amplify_core",
                   "amplify_datastore",
-                  "amplify_datastore_plugin_interface",
                   "amplify_flutter",
-                  "amplify_storage_plugin_interface",
-                  "amplify_storage_s3",
+                  "amplify_storage_s3"
                 ]
       - unit_test_android:
           matrix:

example/lib/Views/ImagePreview.dart

@@ -13,7 +13,6 @@
 // permissions and limitations under the License.
 //
 
-import 'package:amplify_analytics_pinpoint/amplify_analytics_pinpoint.dart';
 import 'package:amplify_flutter/amplify_flutter.dart';
 import 'package:amplify_storage_s3/amplify_storage_s3.dart';
 import 'package:flutter/material.dart';

example/lib/Views/SignInView.dart

@@ -13,7 +13,6 @@
  * permissions and limitations under the License.
  */
 
-import 'package:amplify_auth_cognito/amplify_auth_cognito.dart';
 import 'package:amplify_flutter/amplify_flutter.dart';
 import 'package:flutter/material.dart';
 

example/lib/Views/UserView.dart

@@ -13,7 +13,6 @@
  * permissions and limitations under the License.
  */
 
-import 'package:amplify_auth_cognito/amplify_auth_cognito.dart';
 import 'package:amplify_flutter/amplify_flutter.dart';
 import 'package:flutter/material.dart';
 import 'package:sample_app/Pages/LandingPage.dart';

packages/amplify/amplify_flutter/example/lib/main.dart

@@ -14,6 +14,7 @@
  */
 
 import 'package:amplify_flutter/amplify_flutter.dart';
+import 'package:aws_common/aws_common.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 

packages/amplify/amplify_flutter/example/pubspec.yaml

@@ -6,7 +6,8 @@ description: Demonstrates how to use the amplify plugin.
 publish_to: "none" # Remove this line if you wish to publish to pub.dev
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.15.0 <3.0.0"
+  flutter: ">=2.10.0"
 
 dependencies:
   amplify_flutter:
@@ -16,7 +17,7 @@ dependencies:
     # The example app is bundled with the plugin so we use a path dependency on
     # the parent directory to use the current plugin's version.
     path: ../
-
+  aws_common: ^0.1.0
   flutter:
     sdk: flutter
 

packages/amplify/amplify_flutter/lib/amplify_flutter.dart

@@ -22,24 +22,6 @@ export 'package:amplify_core/amplify_core.dart';
 // Amplify interface
 export 'src/amplify_impl.dart';
 
-// Category interfaces
-export 'src/categories/amplify_categories.dart';
-
-// Config
-export 'src/config/amplify_config.dart';
-export 'src/config/amplify_plugin_config.dart' hide UnknownPluginConfigFactory;
-export 'src/config/amplify_plugin_registry.dart';
-export 'src/config/analytics/analytics_config.dart';
-export 'src/config/api/api_config.dart';
-export 'src/config/auth/auth_config.dart';
-export 'src/config/config_map.dart';
-export 'src/config/storage/storage_config.dart';
-
-// Utilities
-export 'src/utils/equatable.dart';
-export 'src/utils/json.dart';
-export 'src/utils/serializable.dart';
-
 /// Top level singleton Amplify object.
 AmplifyClass get Amplify => AmplifyClass.instance;
 

packages/amplify/amplify_flutter/lib/src/amplify_hub.dart

@@ -16,6 +16,7 @@
 import 'dart:async';
 
 import 'package:amplify_core/amplify_core.dart';
+import 'package:aws_common/aws_common.dart';
 
 import '../amplify_flutter.dart';
 

packages/amplify/amplify_flutter/lib/src/amplify_impl.dart

@@ -15,73 +15,73 @@
 
 import 'dart:async';
 import 'dart:convert';
+import 'dart:io';
 
-import 'package:amplify_analytics_plugin_interface/amplify_analytics_plugin_interface.dart';
-import 'package:amplify_api_plugin_interface/amplify_api_plugin_interface.dart';
-import 'package:amplify_auth_plugin_interface/amplify_auth_plugin_interface.dart';
 import 'package:amplify_core/amplify_core.dart';
-import 'package:amplify_datastore_plugin_interface/amplify_datastore_plugin_interface.dart';
-import 'package:amplify_flutter/src/config/amplify_config.dart';
-import 'package:amplify_storage_plugin_interface/amplify_storage_plugin_interface.dart';
+import 'package:aws_common/aws_common.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
-import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 
 import 'amplify_hub.dart';
-import 'categories/amplify_categories.dart';
 
 part 'method_channel_amplify.dart';
 
+/// {@template amplify_flutter.amplify_class}
 /// Amplify singleton class.
 ///
 /// This class can be extended to create a custom Amplify implementation.
 /// The default Amplify implementation will use method channels, and will
 /// only support iOS and Android platforms.
-class AmplifyClass extends PlatformInterface {
+/// {@endtemplate}
+abstract class AmplifyClass {
+  /// {@macro amplify_flutter.amplify_class}
+  factory AmplifyClass() {
+    if (zIsWeb || Platform.isWindows || Platform.isMacOS || Platform.isLinux) {
+      throw UnsupportedError('This platform is not supported yet');
+    }
+    return MethodChannelAmplify();
+  }
+
   /// The Auth category.
-  final AuthCategory Auth = const AuthCategory();
+  final AuthCategory Auth = AuthCategory();
 
   /// The Analytics category.
-  final AnalyticsCategory Analytics = const AnalyticsCategory();
+  final AnalyticsCategory Analytics = AnalyticsCategory();
 
   /// The Storage category.
-  final StorageCategory Storage = const StorageCategory();
+  final StorageCategory Storage = StorageCategory();
 
   /// The DataStore category.
-  final DataStoreCategory DataStore = const DataStoreCategory();
+  final DataStoreCategory DataStore = DataStoreCategory();
 
   /// The API category.
-  final APICategory API = const APICategory();
+  final APICategory API = APICategory();
 
   /// The Amplify event hub.
   final AmplifyHub Hub = AmplifyHub();
 
+  final _configCompleter = Completer<AmplifyConfig>();
+
   /// Adds one plugin at a time. Note: this method can only
   /// be called before Amplify has been configured. Customers are expected
   /// to check the configuration state by calling `Amplify.isConfigured`
   ///
   /// Throws AmplifyAlreadyConfiguredException if
   /// this method is called after configure (e.g. during hot reload).
-  Future<void> addPlugin(AmplifyPluginInterface plugin) async {
-    return instance.addPlugin(plugin);
-  }
+  Future<void> addPlugin(AmplifyPluginInterface plugin);
 
   /// Adds multiple plugins at the same time. Note: this method can only
   /// be called before Amplify has been configured. Customers are expected
   /// to check the configuration state by calling `Amplify.isConfigured`
   Future<void> addPlugins(List<AmplifyPluginInterface> plugins) {
-    return instance.addPlugins(plugins);
+    return Future.wait(plugins.map(addPlugin), eagerError: true);
   }
 
   /// Returns whether Amplify has been configured or not.
-  bool get isConfigured {
-    return instance.isConfigured;
-  }
+  bool get isConfigured => _configCompleter.isCompleted;
 
   /// A future when completes when Amplify has been successfully configured.
-  Future<AmplifyConfig> get asyncConfig {
-    return instance.asyncConfig;
-  }
+  Future<AmplifyConfig> get asyncConfig => _configCompleter.future;
 
   /// Configures Amplify with the provided configuration string.
   /// **This method can only be called once**, after all the plugins
@@ -92,29 +92,53 @@ class AmplifyClass extends PlatformInterface {
   /// Throws AmplifyAlreadyConfiguredException if
   /// this method is called again (e.g. during hot reload).
   Future<void> configure(String configuration) async {
-    return instance.configure(configuration);
+    if (isConfigured) {
+      throw const AmplifyAlreadyConfiguredException(
+        'Amplify has already been configured and re-configuration is not supported.',
+        recoverySuggestion:
+            'Check if Amplify is already configured using Amplify.isConfigured.',
+      );
+    }
+
+    final AmplifyConfig amplifyConfig;
+    try {
+      final json = jsonDecode(configuration) as Map;
+      amplifyConfig = AmplifyConfig.fromJson(json.cast());
+    } on FormatException catch (e) {
+      throw AmplifyException(
+        '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.toString(),
+      );
+    }
+
+    await configurePlatform(configuration);
+    _configCompleter.complete(amplifyConfig);
   }
 
+  /// Configures the platform-specific implementation of Amplify using the
+  /// registered [config].
+  @protected
+  Future<void> configurePlatform(String config);
+
   /// Constructs a Core platform.
   /// Internal Use Only
   @protected
-  AmplifyClass.protected() : super(token: _token);
+  AmplifyClass.protected();
 
-  static final Object _token = Object();
+  /// The instance of [AmplifyClass] to use.
+  ///
+  /// Defaults to the platform-specific implementation.
+  static AmplifyClass instance = AmplifyClass();
 
-  static AmplifyClass _instance = MethodChannelAmplify();
+  /// The library version.
+  String get version => '0.5.1';
 
-  /// The default instance of [AmplifyClass] to use.
-  ///
-  /// Defaults to [MethodChannelAmplify].
-  static AmplifyClass get instance => _instance;
-
-  /// Platform-specific plugins should set this with their own platform-specific
-  /// class that extends [AmplifyClass] when they register themselves.
-  static set instance(AmplifyClass instance) {
-    PlatformInterface.verifyToken(instance, _token);
-    _instance = instance;
-  }
+  /// Resets the Amplify implementation, removing all traces of Amplify from
+  /// the device.
+  @visibleForTesting
+  Future<void> reset();
 }
 
 // ignore_for_file: non_constant_identifier_names