fix(authenticator): Beta channel fixes (#3835)

aws-amplify · Sep 27, 2023 · 542bd3e · 542bd3e
1 parent d8f4c7b
commit 542bd3e
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 11 deletions.
diff --git a/packages/authenticator/amplify_authenticator/lib/src/enums/confirm_signin_types.dart b/packages/authenticator/amplify_authenticator/lib/src/enums/confirm_signin_types.dart
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'package:amplify_auth_cognito/amplify_auth_cognito.dart';
-import 'package:flutter/foundation.dart';
 
 enum ConfirmSignInField {
   code,
@@ -39,8 +38,7 @@ extension ConfirmSignInFieldX on ConfirmSignInField {
       case ConfirmSignInField.mfaMethod:
         throw StateError('Can only be called on attribute types');
       default:
-        final key =
-            describeEnum(this).replaceAllMapped(RegExp(r'[A-Z]'), (match) {
+        final key = name.replaceAllMapped(RegExp(r'[A-Z]'), (match) {
           return '_${match.group(0)!.toLowerCase()}';
         });
         return CognitoUserAttributeKey.parse(key);

diff --git a/packages/authenticator/amplify_authenticator/lib/src/enums/signup_types.dart b/packages/authenticator/amplify_authenticator/lib/src/enums/signup_types.dart
@@ -2,7 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import 'package:amplify_auth_cognito/amplify_auth_cognito.dart';
-import 'package:flutter/foundation.dart';
 
 enum SignUpField {
   username,
@@ -37,8 +36,7 @@ extension SignUpFieldX on SignUpField {
       case SignUpField.custom:
         throw StateError('Can only be called on attribute types');
       default:
-        final key =
-            describeEnum(this).replaceAllMapped(RegExp(r'[A-Z]'), (match) {
+        final key = name.replaceAllMapped(RegExp(r'[A-Z]'), (match) {
           return '_${match.group(0)!.toLowerCase()}';
         });
         return CognitoUserAttributeKey.parse(key);

diff --git a/packages/authenticator/amplify_authenticator/lib/src/l10n/button_resolver.dart b/packages/authenticator/amplify_authenticator/lib/src/l10n/button_resolver.dart
@@ -4,7 +4,6 @@
 import 'package:amplify_authenticator/amplify_authenticator.dart';
 import 'package:amplify_authenticator/src/l10n/authenticator_localizations.dart';
 import 'package:amplify_authenticator/src/l10n/resolver.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 enum ButtonResolverKeyType {
@@ -67,7 +66,7 @@ class ButtonResolverKey {
   static const copyKey = ButtonResolverKey._(ButtonResolverKeyType.copyKey);
 
   @override
-  String toString() => describeEnum(type);
+  String toString() => type.name;
 }
 
 /// The resolver class for shared button Widgets

diff --git a/packages/authenticator/amplify_authenticator/lib/src/widgets/checkbox.dart b/packages/authenticator/amplify_authenticator/lib/src/widgets/checkbox.dart
@@ -59,7 +59,7 @@ class _AuthenticatorCheckBoxState<T extends AuthenticatorCheckbox<T>>
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
-    properties.add(EnumProperty('onChanged', onChanged));
+    properties.add(DiagnosticsProperty<Function>('onChanged', onChanged));
   }
 }
 

diff --git a/packages/authenticator/amplify_authenticator/lib/src/widgets/form.dart b/packages/authenticator/amplify_authenticator/lib/src/widgets/form.dart
@@ -453,7 +453,7 @@ class _SignInFormState extends AuthenticatorFormState<SignInForm> {
       } else if (b == SocialProvider.apple) {
         return 1;
       }
-      return describeEnum(a).compareTo(describeEnum(b));
+      return a.name.compareTo(b.name);
     });
 
     return [

diff --git a/packages/authenticator/amplify_authenticator/pubspec.yaml b/packages/authenticator/amplify_authenticator/pubspec.yaml
@@ -39,7 +39,7 @@ dev_dependencies:
   build_version: ^2.1.1
   flutter_test:
     sdk: flutter
-  golden_toolkit: ^0.13.0
+  golden_toolkit: ^0.15.0
   mocktail: ^1.0.0
   path: any