chore: address feedback

aws-amplify · Feb 21, 2025 · ba0aa21 · ba0aa21
1 parent 9f70329
commit ba0aa21
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 34 deletions.
diff --git a/packages/ui/src/helpers/authenticator/facade.ts b/packages/ui/src/helpers/authenticator/facade.ts
@@ -217,6 +217,7 @@ export const getServiceContextFacade = (
   })(route);
 
   const facade = {
+    allowedMfaTypes,
     authStatus,
     challengeName,
     codeDeliveryDetails,
@@ -230,7 +231,6 @@ export const getServiceContextFacade = (
     user,
     username,
     validationErrors,
-    allowedMfaTypes,
 
     // @v6-migration-note
     // While most of the properties

diff --git a/packages/ui/src/machines/authenticator/actors/signIn.ts b/packages/ui/src/machines/authenticator/actors/signIn.ts
@@ -81,9 +81,9 @@ const handleFetchUserAttributesResponse = {
   },
 };
 
-const defaultState = {
+const getDefaultConfirmSignInState = (exit: string[]) => ({
   initial: 'edit',
-  exit: ['clearFormValues', 'clearError', 'clearTouched'],
+  exit,
   states: {
     edit: {
       entry: 'sendUpdate',
@@ -99,7 +99,7 @@ const defaultState = {
       invoke: { src: 'confirmSignIn', ...handleSignInResponse },
     },
   },
-};
+});
 
 export function signInActor({ services }: SignInMachineOptions) {
   return createMachine<SignInContext, AuthEvent>(
@@ -187,33 +187,12 @@ export function signInActor({ services }: SignInMachineOptions) {
             },
           },
         },
-        confirmSignIn: {
-          initial: 'edit',
-          exit: [
-            'clearChallengeName',
-            'clearFormValues',
-            'clearError',
-            'clearTouched',
-          ],
-          states: {
-            edit: {
-              entry: 'sendUpdate',
-              on: {
-                SUBMIT: { actions: 'handleSubmit', target: 'submit' },
-                SIGN_IN: '#signInActor.signIn',
-                CHANGE: { actions: 'handleInput' },
-              },
-            },
-            submit: {
-              tags: 'pending',
-              entry: ['clearError', 'sendUpdate'],
-              invoke: {
-                src: 'confirmSignIn',
-                ...handleSignInResponse,
-              },
-            },
-          },
-        },
+        confirmSignIn: getDefaultConfirmSignInState([
+          'clearChallengeName',
+          'clearFormValues',
+          'clearError',
+          'clearTouched',
+        ]),
         forceChangePassword: {
           entry: 'sendUpdate',
           type: 'parallel',
@@ -286,9 +265,21 @@ export function signInActor({ services }: SignInMachineOptions) {
             },
           },
         },
-        setupTotp: defaultState,
-        setupEmail: defaultState,
-        selectMfaType: defaultState,
+        setupTotp: getDefaultConfirmSignInState([
+          'clearFormValues',
+          'clearError',
+          'clearTouched',
+        ]),
+        setupEmail: getDefaultConfirmSignInState([
+          'clearFormValues',
+          'clearError',
+          'clearTouched',
+        ]),
+        selectMfaType: getDefaultConfirmSignInState([
+          'clearFormValues',
+          'clearError',
+          'clearTouched',
+        ]),
         resolved: {
           type: 'final',
           data: (context): ActorDoneData => ({