chore: change the name of the sign in step to make it more broad for …

…passwordless chore: add missing files from API amendment
aws-amplify · Oct 24, 2024 · 2e65efd · 2e65efd
1 parent b5f6dcb
commit 2e65efd
Show file tree

Hide file tree

Showing 28 changed files with 71 additions and 71 deletions.
diff --git a/packages/amplify_core/doc/lib/auth.dart b/packages/amplify_core/doc/lib/auth.dart
@@ -146,7 +146,7 @@ Future<void> _handleSignInResult(SignInResult result) async {
       _handleCodeDelivery(codeDeliveryDetails);
     // #enddocregion handle-confirm-signin-sms
     // #docregion handle-confirm-signin-email
-    case AuthSignInStep.confirmSignInWithEmailMfaCode:
+    case AuthSignInStep.confirmSignInWithOtpCode:
       final codeDeliveryDetails = result.nextStep.codeDeliveryDetails!;
       _handleCodeDelivery(codeDeliveryDetails);
     // #enddocregion handle-confirm-signin-email

diff --git a/packages/amplify_core/lib/src/types/auth/sign_in/auth_next_sign_in_step.g.dart b/packages/amplify_core/lib/src/types/auth/sign_in/auth_next_sign_in_step.g.dart
diff --git a/packages/amplify_core/lib/src/types/auth/sign_in/auth_sign_in_step.dart b/packages/amplify_core/lib/src/types/auth/sign_in/auth_sign_in_step.dart
@@ -29,7 +29,7 @@ enum AuthSignInStep {
   confirmSignInWithTotpMfaCode,
 
   /// The sign-in is not complete and must be confirmed with an email code.
-  confirmSignInWithEmailMfaCode,
+  confirmSignInWithOtpCode,
 
   /// The sign-in is not complete and must be confirmed with the user's new
   /// password.

diff --git a/packages/auth/amplify_auth_cognito/example/integration_test/mfa_email_optional_test.dart b/packages/auth/amplify_auth_cognito/example/integration_test/mfa_email_optional_test.dart
@@ -60,7 +60,7 @@ void main() {
             password: password,
           );
           check(signInRes.nextStep.signInStep)
-              .equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+              .equals(AuthSignInStep.confirmSignInWithOtpCode);
           check(signInRes.nextStep.codeDeliveryDetails)
               .isNotNull()
               .has((d) => d.deliveryMedium, 'deliveryMedium')

diff --git a/packages/auth/amplify_auth_cognito/example/integration_test/mfa_email_required_test.dart b/packages/auth/amplify_auth_cognito/example/integration_test/mfa_email_required_test.dart
@@ -37,7 +37,7 @@ void main() {
           password: password,
         );
         check(signInRes.nextStep.signInStep)
-            .equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+            .equals(AuthSignInStep.confirmSignInWithOtpCode);
 
         final confirmRes = await Amplify.Auth.confirmSignIn(
           confirmationValue: await otpResult.code,
@@ -63,7 +63,7 @@ void main() {
             password: password,
           );
           check(signInRes.nextStep.signInStep)
-              .equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+              .equals(AuthSignInStep.confirmSignInWithOtpCode);
           check(signInRes.nextStep.codeDeliveryDetails)
               .isNotNull()
               .has((d) => d.deliveryMedium, 'deliveryMedium')

diff --git a/...ages/auth/amplify_auth_cognito/example/integration_test/mfa_email_totp_optional_test.dart b/...ages/auth/amplify_auth_cognito/example/integration_test/mfa_email_totp_optional_test.dart
@@ -230,7 +230,7 @@ void main() {
             password: password,
           );
           check(signInRes.nextStep.signInStep)
-              .equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+              .equals(AuthSignInStep.confirmSignInWithOtpCode);
           check(signInRes.nextStep.codeDeliveryDetails)
               .isNotNull()
               .has((d) => d.deliveryMedium, 'deliveryMedium')
@@ -353,7 +353,7 @@ void main() {
           confirmationValue: 'EMAIL',
         );
         check(selectRes.nextStep.signInStep)
-            .equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+            .equals(AuthSignInStep.confirmSignInWithOtpCode);
         check(selectRes.nextStep.codeDeliveryDetails)
             .isNotNull()
             .has((d) => d.deliveryMedium, 'deliveryMedium')
@@ -392,7 +392,7 @@ void main() {
             password: password,
           );
           check(signInRes.nextStep.signInStep)
-              .equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+              .equals(AuthSignInStep.confirmSignInWithOtpCode);
           check(signInRes.nextStep.codeDeliveryDetails)
               .isNotNull()
               .has((d) => d.deliveryMedium, 'deliveryMedium')

diff --git a/...ages/auth/amplify_auth_cognito/example/integration_test/mfa_email_totp_required_test.dart b/...ages/auth/amplify_auth_cognito/example/integration_test/mfa_email_totp_required_test.dart
@@ -37,7 +37,7 @@ void main() {
           signInRes.nextStep.signInStep,
           because:
               'When an email is registered and the userpool has email MFA enabled, Cognito will automatically enable email MFA as the preferred MFA method.',
-        ).equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+        ).equals(AuthSignInStep.confirmSignInWithOtpCode);
 
         final setupRes = await Amplify.Auth.confirmSignIn(
           confirmationValue: await otpResult.code,
@@ -60,7 +60,7 @@ void main() {
           password: password,
         );
         check(resignInRes.nextStep.signInStep)
-            .equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+            .equals(AuthSignInStep.confirmSignInWithOtpCode);
         check(resignInRes.nextStep.codeDeliveryDetails)
             .isNotNull()
             .has((d) => d.deliveryMedium, 'deliveryMedium')
@@ -98,7 +98,7 @@ void main() {
             signInRes.nextStep.signInStep,
             because:
                 'MFA is required so Cognito automatically enables EMAIL MFA',
-          ).equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+          ).equals(AuthSignInStep.confirmSignInWithOtpCode);
 
           final confirmRes = await Amplify.Auth.confirmSignIn(
             confirmationValue: await otpResult.code,
@@ -224,7 +224,7 @@ void main() {
           check(
             signInRes.nextStep.signInStep,
             because: 'Preference is EMAIL MFA now',
-          ).equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+          ).equals(AuthSignInStep.confirmSignInWithOtpCode);
           check(signInRes.nextStep.codeDeliveryDetails)
               .isNotNull()
               .has((d) => d.deliveryMedium, 'deliveryMedium')

diff --git a/packages/auth/amplify_auth_cognito/example/integration_test/mfa_sms_email_optional_test.dart b/packages/auth/amplify_auth_cognito/example/integration_test/mfa_sms_email_optional_test.dart
@@ -64,7 +64,7 @@ void main() {
             signInRes.nextStep.signInStep,
             because: 'Once Email MFA is preferred, it is performed '
                 'on every sign-in attempt.',
-          ).equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+          ).equals(AuthSignInStep.confirmSignInWithOtpCode);
           check(signInRes.nextStep.codeDeliveryDetails)
               .isNotNull()
               .has((d) => d.deliveryMedium, 'deliveryMedium')
@@ -155,7 +155,7 @@ void main() {
             password: password,
           );
           check(signInRes.nextStep.signInStep)
-              .equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+              .equals(AuthSignInStep.confirmSignInWithOtpCode);
           check(signInRes.nextStep.codeDeliveryDetails)
               .isNotNull()
               .has((d) => d.deliveryMedium, 'deliveryMedium')
@@ -386,7 +386,7 @@ void main() {
           );
 
           check(signInRes.nextStep.signInStep)
-              .equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+              .equals(AuthSignInStep.confirmSignInWithOtpCode);
           check(signInRes.nextStep.codeDeliveryDetails)
               .isNotNull()
               .has((d) => d.deliveryMedium, 'deliveryMedium')

diff --git a/packages/auth/amplify_auth_cognito/example/integration_test/mfa_sms_email_required_test.dart b/packages/auth/amplify_auth_cognito/example/integration_test/mfa_sms_email_required_test.dart
@@ -41,7 +41,7 @@ void main() {
           signInRes.nextStep.signInStep,
           because: 'MFA is required, and EMAIL is chosen when '
               'no phone number is registered',
-        ).equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+        ).equals(AuthSignInStep.confirmSignInWithOtpCode);
 
         final setupRes = await Amplify.Auth.confirmSignIn(
           confirmationValue: await otpResult.code,
@@ -68,7 +68,7 @@ void main() {
           password: password,
         );
         check(resignInRes.nextStep.signInStep)
-            .equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+            .equals(AuthSignInStep.confirmSignInWithOtpCode);
         check(resignInRes.nextStep.codeDeliveryDetails)
             .isNotNull()
             .has((d) => d.deliveryMedium, 'deliveryMedium')
@@ -147,7 +147,7 @@ void main() {
           check(
             resignInRes.nextStep.signInStep,
             because: 'Preference is EMAIL MFA now',
-          ).equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+          ).equals(AuthSignInStep.confirmSignInWithOtpCode);
           check(resignInRes.nextStep.codeDeliveryDetails)
               .isNotNull()
               .has((d) => d.deliveryMedium, 'deliveryMedium')
@@ -300,7 +300,7 @@ void main() {
           check(
             signInRes.nextStep.signInStep,
             because: 'Preference is EMAIL MFA now',
-          ).equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+          ).equals(AuthSignInStep.confirmSignInWithOtpCode);
           check(signInRes.nextStep.codeDeliveryDetails)
               .isNotNull()
               .has((d) => d.deliveryMedium, 'deliveryMedium')

diff --git a/.../auth/amplify_auth_cognito/example/integration_test/mfa_username_login_required_test.dart b/.../auth/amplify_auth_cognito/example/integration_test/mfa_username_login_required_test.dart
@@ -72,7 +72,7 @@ void main() {
           password: password,
         );
         check(resignInRes.nextStep.signInStep)
-            .equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+            .equals(AuthSignInStep.confirmSignInWithOtpCode);
         check(resignInRes.nextStep.codeDeliveryDetails)
             .isNotNull()
             .has((d) => d.deliveryMedium, 'deliveryMedium')
@@ -199,7 +199,7 @@ void main() {
           );
 
           check(resignInRes.nextStep.signInStep)
-              .equals(AuthSignInStep.confirmSignInWithEmailMfaCode);
+              .equals(AuthSignInStep.confirmSignInWithOtpCode);
           check(resignInRes.nextStep.codeDeliveryDetails)
               .isNotNull()
               .has((d) => d.deliveryMedium, 'deliveryMedium')

diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/flows/constants.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/flows/constants.dart
@@ -61,7 +61,7 @@ abstract class CognitoConstants {
   static const challengeParamSmsMfaCode = 'SMS_MFA_CODE';
 
   /// The `EMAIL_OTP_CODE` parameter.
-  static const challengeParamEmailMfaCode = 'EMAIL_OTP_CODE';
+  static const challengeParamEmailOtpCode = 'EMAIL_OTP_CODE';
 
   /// The `SOFTWARE_TOKEN_MFA_CODE` parameter.
   static const challengeParamSoftwareTokenMfaCode = 'SOFTWARE_TOKEN_MFA_CODE';

diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/sdk_bridge.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/sdk/sdk_bridge.dart
@@ -33,7 +33,7 @@ extension ChallengeNameTypeBridge on ChallengeNameType {
         ChallengeNameType.softwareTokenMfa =>
           AuthSignInStep.confirmSignInWithTotpMfaCode,
         ChallengeNameType.emailOtp =>
-          AuthSignInStep.confirmSignInWithEmailMfaCode,
+          AuthSignInStep.confirmSignInWithOtpCode,
         ChallengeNameType.adminNoSrpAuth ||
         ChallengeNameType.passwordVerifier ||
         ChallengeNameType.devicePasswordVerifier ||

diff --git a/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_in_state_machine.dart b/packages/auth/amplify_auth_cognito_dart/lib/src/state/machines/sign_in_state_machine.dart
@@ -327,7 +327,7 @@ final class SignInStateMachine
       ChallengeNameType.softwareTokenMfa when hasUserResponse =>
         createSoftwareTokenMfaRequest(event),
       ChallengeNameType.emailOtp when hasUserResponse =>
-        createEmailMfaRequest(event),
+        createEmailOtpRequest(event),
       ChallengeNameType.selectMfaType when hasUserResponse =>
         createSelectMfaRequest(event),
       ChallengeNameType.mfaSetup when hasUserResponse =>
@@ -454,7 +454,7 @@ final class SignInStateMachine
 
   /// Creates the response object for an Email MFA challenge.
   @protected
-  Future<RespondToAuthChallengeRequest> createEmailMfaRequest(
+  Future<RespondToAuthChallengeRequest> createEmailOtpRequest(
     SignInRespondToChallenge event,
   ) async {
     _enableMfaType = MfaType.email;
@@ -464,7 +464,7 @@ final class SignInStateMachine
         ..challengeName = _challengeName
         ..challengeResponses.addAll({
           CognitoConstants.challengeParamUsername: cognitoUsername,
-          CognitoConstants.challengeParamEmailMfaCode: event.answer,
+          CognitoConstants.challengeParamEmailOtpCode: event.answer,
         })
         ..clientMetadata.addAll(event.clientMetadata);
     });
@@ -702,13 +702,13 @@ final class SignInStateMachine
 
     // User has provided the verification code
     return _enableMfaType == MfaType.totp
-        ? createMfaSetupRequest(event)
+        ? createTotpMfaSetupRequest(event)
         : createEmailMfaSetupRequest(event);
   }
 
   /// Completes set up of a TOTP MFA.
   @protected
-  Future<RespondToAuthChallengeRequest> createMfaSetupRequest(
+  Future<RespondToAuthChallengeRequest> createTotpMfaSetupRequest(
     SignInRespondToChallenge event,
   ) async {
     await verifySoftwareToken(

diff --git a/.../authenticator/amplify_authenticator/example/integration_test/sign_in_mfa_email_test.dart b/.../authenticator/amplify_authenticator/example/integration_test/sign_in_mfa_email_test.dart
@@ -36,10 +36,10 @@ void main() {
           tester.bloc.stream,
           emitsInOrder([
             UnauthenticatedState.signIn,
-            UnauthenticatedState.confirmSignInWithEmailMfaCode,
+            UnauthenticatedState.confirmSignInWithOtpCode,
             isA<AuthenticatedState>(),
             UnauthenticatedState.signIn,
-            UnauthenticatedState.confirmSignInWithEmailMfaCode,
+            UnauthenticatedState.confirmSignInWithOtpCode,
             isA<AuthenticatedState>(),
             emitsDone,
           ]),
@@ -62,7 +62,7 @@ void main() {
         await signInPage.submitSignIn();
 
         // Then I will be redirected to the email MFA code page
-        await confirmSignInPage.expectConfirmSignInWithEmailMfaCodeIsPresent();
+        await confirmSignInPage.expectConfirmSignInWithOtpCodeIsPresent();
 
         // And I type a valid EMAIL OTP code
         await confirmSignInPage.enterVerificationCode(await otpResult.code);
@@ -94,7 +94,7 @@ void main() {
         await signInPage.submitSignIn();
 
         // Then I will be redirected to the EMAIL OTP code page
-        await confirmSignInPage.expectConfirmSignInWithEmailMfaCodeIsPresent();
+        await confirmSignInPage.expectConfirmSignInWithOtpCodeIsPresent();
 
         // When I type a valid EMAIL OTP code
         await confirmSignInPage.enterVerificationCode(await otpResult2.code);
@@ -129,7 +129,7 @@ void main() {
           tester.bloc.stream,
           emitsInOrder([
             UnauthenticatedState.signIn,
-            UnauthenticatedState.confirmSignInWithEmailMfaCode,
+            UnauthenticatedState.confirmSignInWithOtpCode,
             emitsDone,
           ]),
         );
@@ -147,7 +147,7 @@ void main() {
         await signInPage.submitSignIn();
 
         // Then I will be redirected to the EMAIL OTP code page
-        await confirmSignInPage.expectConfirmSignInWithEmailMfaCodeIsPresent();
+        await confirmSignInPage.expectConfirmSignInWithOtpCodeIsPresent();
 
         // And I type an invalid confirmation code
         await confirmSignInPage.enterVerificationCode('123456');

diff --git a/...enticator/amplify_authenticator/example/integration_test/sign_in_mfa_email_totp_test.dart b/...enticator/amplify_authenticator/example/integration_test/sign_in_mfa_email_totp_test.dart
@@ -36,7 +36,7 @@ void main() {
           tester.bloc.stream,
           emitsInOrder([
             UnauthenticatedState.signIn,
-            UnauthenticatedState.confirmSignInWithEmailMfaCode,
+            UnauthenticatedState.confirmSignInWithOtpCode,
             isA<AuthenticatedState>(),
             UnauthenticatedState.signIn,
             isA<ContinueSignInWithMfaSelection>(),
@@ -61,7 +61,7 @@ void main() {
         await signInPage.submitSignIn();
 
         // Then I will be redirected to the confirm email mfa page
-        await confirmSignInPage.expectConfirmSignInWithEmailMfaCodeIsPresent();
+        await confirmSignInPage.expectConfirmSignInWithOtpCodeIsPresent();
 
         // When I type a valid confirmation code
         await confirmSignInPage.enterVerificationCode(await otpResult.code);
@@ -138,11 +138,11 @@ void main() {
           tester.bloc.stream,
           emitsInOrder([
             UnauthenticatedState.signIn,
-            UnauthenticatedState.confirmSignInWithEmailMfaCode,
+            UnauthenticatedState.confirmSignInWithOtpCode,
             isA<AuthenticatedState>(),
             UnauthenticatedState.signIn,
             isA<ContinueSignInWithMfaSelection>(),
-            UnauthenticatedState.confirmSignInWithEmailMfaCode,
+            UnauthenticatedState.confirmSignInWithOtpCode,
             isA<AuthenticatedState>(),
             emitsDone,
           ]),
@@ -163,7 +163,7 @@ void main() {
         await signInPage.submitSignIn();
 
         // Then I will be redirected to the confirm email mfa page
-        await confirmSignInPage.expectConfirmSignInWithEmailMfaCodeIsPresent();
+        await confirmSignInPage.expectConfirmSignInWithOtpCodeIsPresent();
 
         // When I type a valid confirmation code
         await confirmSignInPage.enterVerificationCode(await otpResult.code);
@@ -205,7 +205,7 @@ void main() {
         await confirmSignInPage.submitConfirmSignInMfaSelection();
 
         // Then I will be redirected to the confirm EMAIL mfa page
-        await confirmSignInPage.expectConfirmSignInWithEmailMfaCodeIsPresent();
+        await confirmSignInPage.expectConfirmSignInWithOtpCodeIsPresent();
 
         // When I type a valid confirmation code
         await confirmSignInPage.enterVerificationCode(await otpResult2.code);

diff --git a/...henticator/amplify_authenticator/example/integration_test/sign_in_mfa_sms_email_test.dart b/...henticator/amplify_authenticator/example/integration_test/sign_in_mfa_sms_email_test.dart
@@ -46,7 +46,7 @@ void main() {
             UnauthenticatedState.confirmSignInMfa,
             isA<AuthenticatedState>(),
             UnauthenticatedState.signIn,
-            UnauthenticatedState.confirmSignInWithEmailMfaCode,
+            UnauthenticatedState.confirmSignInWithOtpCode,
             isA<AuthenticatedState>(),
             emitsDone,
           ]),
@@ -101,7 +101,7 @@ void main() {
         await signInPage.submitSignIn();
 
         // Then I will be redirected to the EMAIL MFA code page
-        await confirmSignInPage.expectConfirmSignInWithEmailMfaCodeIsPresent();
+        await confirmSignInPage.expectConfirmSignInWithOtpCodeIsPresent();
 
         // When I type a valid EMAIL MFA code
         await confirmSignInPage.enterVerificationCode(await code_2.code);

diff --git a/...cator/amplify_authenticator/example/integration_test/sign_in_mfa_username_login_test.dart b/...cator/amplify_authenticator/example/integration_test/sign_in_mfa_username_login_test.dart
@@ -37,7 +37,7 @@ void main() {
             UnauthenticatedState.signIn,
             isA<ContinueSignInWithMfaSetupSelection>(),
             UnauthenticatedState.continueSignInWithEmailMfaSetup,
-            UnauthenticatedState.confirmSignInWithEmailMfaCode,
+            UnauthenticatedState.confirmSignInWithOtpCode,
             isA<AuthenticatedState>(),
             emitsDone,
           ]),

diff --git a/packages/authenticator/amplify_authenticator/lib/amplify_authenticator.dart b/packages/authenticator/amplify_authenticator/lib/amplify_authenticator.dart
@@ -719,7 +719,7 @@ class _AuthenticatorState extends State<Authenticator> {
                 continueSignInWithEmailMfaSetupForm:
                     ContinueSignInWithEmailMfaSetupForm(),
                 confirmSignInWithTotpMfaCodeForm: ConfirmSignInMFAForm(),
-                confirmSignInWithEmailMfaCodeForm: ConfirmSignInMFAForm(),
+                confirmSignInWithOtpCodeForm: ConfirmSignInMFAForm(),
                 verifyUserForm: VerifyUserForm(),
                 confirmVerifyUserForm: ConfirmVerifyUserForm(),
                 child: widget.child,