Clean up

Author: Dillon Nys

packages/amplify_authenticator/lib/amplify_authenticator.dart

@@ -578,20 +578,12 @@ class _AuthenticatorState extends State<Authenticator> {
   }
 
   Future<void> _waitForConfiguration() async {
-    try {
-      final config = await Amplify.asyncConfig;
-      setState(() {
-        _config = config;
-        _configInitialized = true;
-        _missingConfigValues = missingConfigValues(config);
-      });
-    } on Exception catch (e) {
-      _showExceptionBanner(
-        type: StatusType.error,
-        message: AuthenticatorException(e).message,
-      );
-      await _waitForConfiguration();
-    }
+    final config = await Amplify.asyncConfig;
+    setState(() {
+      _config = config;
+      _configInitialized = true;
+      _missingConfigValues = missingConfigValues(config);
+    });
   }
 
   List<String> missingConfigValues(AmplifyConfig? config) {

packages/amplify_core/lib/amplify_core.dart

@@ -86,7 +86,7 @@ export 'src/types/exception/amplify_already_configured_exception.dart';
 export 'src/types/exception/amplify_exception.dart';
 export 'src/types/exception/amplify_exception_messages.dart';
 export 'src/types/exception/codegen_exception.dart';
-export 'src/types/exception/configuration_exception.dart';
+export 'src/types/exception/configuration_error.dart';
 export 'src/types/exception/url_launcher_exception.dart';
 
 /// Model-based types used in datastore and API

packages/amplify_core/lib/src/amplify_class.dart

@@ -95,24 +95,24 @@ abstract class AmplifyClass {
       try {
         final json = jsonDecode(configuration) as Map;
         amplifyConfig = AmplifyConfig.fromJson(json.cast());
-      } on Object catch (e) {
-        throw ConfigurationException(
-          'The provided configuration is not a valid json. Check underlyingException.',
+      } on Object {
+        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,
+              'Inspect your amplifyconfiguration.dart and ensure that '
+              'the string is proper json',
         );
       }
       await configurePlatform(configuration);
       _configCompleter.complete(amplifyConfig);
-    } on ConfigurationException catch (e, st) {
+    } 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
       // on `asyncConfig` are notified of the error so they can handle it as
       // appropriate. For example, the Authenticator listens for `asyncConfig`
       // to complete before updating the UI.
       _configCompleter.completeError(e, st);
-      _configCompleter = Completer();
       rethrow;
     } on Object {
       // At this point, configuration is complete in the sense that the

packages/amplify_core/lib/src/types/exception/configuration_error.dart

@@ -0,0 +1,40 @@
+// Copyright 2022 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/// {@template amplify_core.exceptions.configuration_error}
+/// An error occurring during configuration of an Amplify plugin, typically
+/// the result of missing values needed for that plugin to function properly.
+///
+/// This is a non-recoverable error only thrown during the call to
+/// `Amplify.configure`. If that call succeeds, developers do not need to worry
+/// about future configuration errors.
+/// {@endtemplate}
+class ConfigurationError extends Error {
+  /// {@macro amplify_core.exceptions.configuration_error}
+  ConfigurationError(
+    this.message, {
+    this.recoverySuggestion,
+  });
+
+  /// A description of the error.
+  final String message;
+
+  /// Details on how to fix the issue, if available.
+  final String? recoverySuggestion;
+
+  @override
+  String toString() {
+    return 'ConfigurationError($message${recoverySuggestion == null ? '' : ', $recoverySuggestion'})';
+  }
+}

packages/amplify_core/lib/src/types/exception/configuration_exception.dart

@@ -36,23 +36,23 @@ void main() {
       test('throws for invalid JSON', () async {
         expect(
           Amplify.asyncConfig,
-          throwsA(isA<ConfigurationException>()),
+          throwsA(isA<ConfigurationError>()),
         );
         expect(
           Amplify.configure('...'),
-          throwsA(isA<ConfigurationException>()),
+          throwsA(isA<ConfigurationError>()),
         );
       });
 
       test('throws for configuration exceptions', () async {
         expect(
           Amplify.asyncConfig,
-          throwsA(isA<ConfigurationException>()),
+          throwsA(isA<ConfigurationError>()),
         );
         await Amplify.addPlugin(ConfigErrorPlugin());
         expect(
           Amplify.configure(dummyConfiguration),
-          throwsA(isA<ConfigurationException>()),
+          throwsA(isA<ConfigurationError>()),
         );
       });
 
@@ -74,7 +74,7 @@ class ConfigErrorPlugin extends AnalyticsPluginInterface {
     AmplifyConfig? config,
     required AmplifyAuthProviderRepository authProviderRepo,
   }) {
-    throw const ConfigurationException('Could not configure');
+    throw ConfigurationError('Could not configure');
   }
 }
 

packages/amplify_core/test/amplify_class_test.dart

@@ -269,7 +269,7 @@ class AmplifyAuthCognitoDart extends AuthPluginInterface<
     required AmplifyAuthProviderRepository authProviderRepo,
   }) async {
     if (config == null) {
-      throw const ConfigurationException('No Cognito plugin config detected');
+      throw ConfigurationError('No Cognito plugin config detected');
     }
 
     if (_stateMachine.getOrCreate(AuthStateMachine.type).currentState.type !=

packages/auth/amplify_auth_cognito_dart/lib/src/auth_plugin_impl.dart

@@ -48,7 +48,7 @@ class AuthStateMachine extends AuthStateMachineBase {
     // InitializeAuthConfiguration
     final cognitoConfig = event.config.auth?.awsPlugin;
     if (cognitoConfig == null) {
-      throw const ConfigurationException('No Cognito plugin config available');
+      throw ConfigurationError('No Cognito plugin config available');
     }
     addInstance(cognitoConfig);
     final config = AuthConfiguration.fromConfig(cognitoConfig);