fix(datastore): hot restart

Ignore platform exceptions so that authenticator no longer freezes app with datastore on hot restart.
aws-amplify · Aug 1, 2023 · 76a11ef · 76a11ef
1 parent 86d086c
commit 76a11ef
Showing 1 changed file with 9 additions and 21 deletions.
diff --git a/packages/amplify_datastore/lib/amplify_datastore.dart b/packages/amplify_datastore/lib/amplify_datastore.dart
@@ -15,7 +15,8 @@ import 'package:meta/meta.dart';
 export 'package:amplify_core/src/types/datastore/datastore_types.dart'
     hide DateTimeParse;
 
-class AmplifyDataStore extends DataStorePluginInterface {
+class AmplifyDataStore extends DataStorePluginInterface
+    with AWSDebuggable, AmplifyLoggerMixin {
   /// Constructs an AmplifyDataStore plugin with mandatory [modelProvider]
   /// and optional datastore configuration properties including
   ///
@@ -77,16 +78,9 @@ class AmplifyDataStore extends DataStorePluginInterface {
       } on PlatformException catch (e) {
         if (e.code.contains('AmplifyAlreadyConfiguredException') ||
             e.code.contains('AlreadyConfiguredException')) {
-          throw const AmplifyAlreadyConfiguredException(
-            AmplifyExceptionMessages.alreadyConfiguredDefaultMessage,
-            recoverySuggestion:
-                AmplifyExceptionMessages.alreadyConfiguredDefaultSuggestion,
-          );
+          logger.info('Ignoring Amplify Native already configured exception');
         }
-        throw ConfigurationError(
-          e.message ?? 'An unknown error occurred',
-          underlyingException: e,
-        );
+        return;
       }
       // Update the native cache for the current user on hub events.
       Future<void> updateCurrentUser(AuthUser? currentUser) async {
@@ -128,17 +122,7 @@ class AmplifyDataStore extends DataStorePluginInterface {
         await nativeBridge.addApiPlugin(authProvidersList);
       } on PlatformException catch (e) {
         if (e.code.contains('AmplifyAlreadyConfiguredException') ||
-            e.code.contains('AlreadyConfiguredException')) {
-          throw const AmplifyAlreadyConfiguredException(
-            AmplifyExceptionMessages.alreadyConfiguredDefaultMessage,
-            recoverySuggestion:
-                AmplifyExceptionMessages.alreadyConfiguredDefaultSuggestion,
-          );
-        }
-        throw ConfigurationError(
-          e.message ?? 'An unknown error occurred',
-          underlyingException: e,
-        );
+            e.code.contains('AlreadyConfiguredException')) {}
       }
     }
 
@@ -154,6 +138,7 @@ class AmplifyDataStore extends DataStorePluginInterface {
           Map<String, String>.from(e.details as Map),
         );
       } else if (e.code == 'AmplifyAlreadyConfiguredException') {
+        logger.info('Ignoring Amplify Native already configured exception');
         return;
       } else {
         // This shouldn't happen. All exceptions coming from platform for
@@ -253,6 +238,9 @@ class AmplifyDataStore extends DataStorePluginInterface {
       throttleOptions: throttleOptions,
     );
   }
+
+  @override
+  String get runtimeTypeName => 'AmplifyDataStore';
 }
 
 class _NativeAmplifyAuthCognito