chore: Revert "fix(authenticator): required phone number validator (#…

…4106)" (#4117) Revert "fix(authenticator): required phone number validator (#4106)" This reverts commit eb6e68b.
aws-amplify · Nov 13, 2023 · ddafa9a · ddafa9a
1 parent eb6e68b
commit ddafa9a
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 63 deletions.
diff --git a/packages/authenticator/amplify_authenticator/lib/src/mixins/authenticator_phone_field.dart b/packages/authenticator/amplify_authenticator/lib/src/mixins/authenticator_phone_field.dart
@@ -47,8 +47,7 @@ mixin AuthenticatorPhoneFieldMixin<FieldType extends Enum,
     return phoneNumber?.ensureStartsWith('+${state.dialCode.value}');
   }
 
-  String displayPhoneNumber(String? phoneNumber) {
-    phoneNumber = phoneNumber ?? '';
+  String displayPhoneNumber(String phoneNumber) {
     final prefix = '+${state.dialCode.value}';
     if (phoneNumber.startsWith(prefix)) {
       phoneNumber = phoneNumber.substring(prefix.length);

diff --git a/...ages/authenticator/amplify_authenticator/lib/src/mixins/authenticator_username_field.dart b/...ages/authenticator/amplify_authenticator/lib/src/mixins/authenticator_username_field.dart
@@ -164,15 +164,6 @@ mixin AuthenticatorUsernameField<FieldType extends Enum,
     }
   }
 
-  String displayPhoneNumber(String? phoneNumber) {
-    phoneNumber = phoneNumber ?? '';
-    final prefix = '+${state.dialCode.value}';
-    if (phoneNumber.startsWith(prefix)) {
-      phoneNumber = phoneNumber.substring(prefix.length);
-    }
-    return phoneNumber;
-  }
-
   @override
   FormFieldValidator<UsernameInput> get validator {
     switch (selectedUsernameType) {
@@ -192,7 +183,7 @@ mixin AuthenticatorUsernameField<FieldType extends Enum,
               isOptional: isOptional,
               context: context,
               inputResolver: stringResolver.inputs,
-            )(displayPhoneNumber(input?.username));
+            )(input?.username);
     }
   }
 

diff --git a/packages/authenticator/amplify_authenticator/lib/src/utils/validators.dart b/packages/authenticator/amplify_authenticator/lib/src/utils/validators.dart
@@ -11,13 +11,7 @@ import 'package:flutter/material.dart';
 */
 final usernameRegex = RegExp(r'^\S+$');
 final emailRegex = RegExp(r'^\S+@\S+$');
-
-/// Regex for a valid phone number.
-///
-/// The "+" prefix is excluded since validation is performed against the number
-/// without the prefix. That is, if the full number is "+1-123-555-7890", the
-/// "+1" is dropped prior to validation.
-final phoneNumberRegex = RegExp(r'^\d+$');
+final phoneNumberRegex = RegExp(r'^\+\d+$');
 final _codeRegex = RegExp(r'^\d{6}$');
 final _uppercase = RegExp(r'[A-Z]');
 final _lowercase = RegExp(r'[a-z]');
@@ -162,8 +156,8 @@ FormFieldValidator<String> validatePhoneNumber({
         InputResolverKey.phoneNumberEmpty,
       );
     }
-    final formattedNumber = phoneNumber.trim();
-    if (!phoneNumberRegex.hasMatch(formattedNumber)) {
+    phoneNumber = phoneNumber.trim();
+    if (!phoneNumberRegex.hasMatch(phoneNumber)) {
       return inputResolver.resolve(context, InputResolverKey.phoneNumberFormat);
     }
     return null;

diff --git a/...ticator/amplify_authenticator/lib/src/widgets/form_fields/confirm_sign_in_form_field.dart b/...ticator/amplify_authenticator/lib/src/widgets/form_fields/confirm_sign_in_form_field.dart
@@ -559,7 +559,7 @@ class _ConfirmSignInPhoneFieldState extends _ConfirmSignInTextFieldState
   @override
   FormFieldValidator<String> get validator {
     return (phoneNumber) {
-      phoneNumber = displayPhoneNumber(phoneNumber);
+      phoneNumber = formatPhoneNumber(phoneNumber);
       return validatePhoneNumber(
         inputResolver: stringResolver.inputs,
         context: context,

diff --git a/...s/authenticator/amplify_authenticator/lib/src/widgets/form_fields/phone_number_field.dart b/...s/authenticator/amplify_authenticator/lib/src/widgets/form_fields/phone_number_field.dart
@@ -86,12 +86,11 @@ class _AuthenticatorPhoneFieldState<FieldType extends Enum>
   @override
   FormFieldValidator<String> get validator {
     return (String? phoneNumber) {
+      phoneNumber = formatPhoneNumber(phoneNumber);
       final validator = widget.validator;
       if (validator != null) {
-        phoneNumber = formatPhoneNumber(phoneNumber);
         return validator(phoneNumber);
       }
-      phoneNumber = displayPhoneNumber(phoneNumber);
       return validatePhoneNumber(
         inputResolver: stringResolver.inputs,
         context: context,

diff --git a/...s/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_up_form_field.dart b/...s/authenticator/amplify_authenticator/lib/src/widgets/form_fields/sign_up_form_field.dart
@@ -738,7 +738,7 @@ class _SignUpPhoneFieldState extends _SignUpTextFieldState
   @override
   FormFieldValidator<String> get validator {
     return (phoneNumber) {
-      phoneNumber = displayPhoneNumber(phoneNumber);
+      phoneNumber = formatPhoneNumber(phoneNumber);
       return validatePhoneNumber(
         inputResolver: stringResolver.inputs,
         context: context,

diff --git a/packages/authenticator/amplify_authenticator/test/sign_up_form_test.dart b/packages/authenticator/amplify_authenticator/test/sign_up_form_test.dart
@@ -118,44 +118,6 @@ void main() {
         },
       );
 
-      testWidgets(
-        'displays message when submitted with empty phone number if the field is required',
-        (tester) async {
-          await tester.pumpWidget(
-            MockAuthenticatorApp(
-              initialStep: AuthenticatorStep.signUp,
-              signUpForm: SignUpForm.custom(
-                fields: [
-                  SignUpFormField.username(),
-                  SignUpFormField.phoneNumber(required: true),
-                  SignUpFormField.password(),
-                ],
-              ),
-            ),
-          );
-          await tester.pumpAndSettle();
-
-          final signUpPage = SignUpPage(tester: tester);
-
-          await signUpPage.submitSignUp();
-
-          await tester.pumpAndSettle();
-
-          Finder findPhoneFieldError() => find.descendant(
-                of: signUpPage.phoneField,
-                matching: find.text('Phone Number field must not be blank.'),
-              );
-
-          expect(findPhoneFieldError(), findsOneWidget);
-
-          await signUpPage.enterPhoneNumber('1235556789');
-
-          await signUpPage.submitSignUp();
-
-          expect(findPhoneFieldError(), findsNothing);
-        },
-      );
-
       testWidgets(
         'displays message when submitted with invalid birth date',
         (tester) async {