@aws-amplify/ui 6.9.1 → 6.10.1

package/dist/esm/machines/authenticator/actors/signUp.mjs

@@ -40,6 +40,7 @@ const handleAutoSignInResponse = {
                 'setChallengeName',
                 'setMissingAttributes',
                 'setTotpSecretCode',
+                'setAllowedMfaTypes',
             ],
             target: '#signUpActor.resolved',
         },
@@ -243,6 +244,7 @@ function signUpActor({ services }) {
                     totpSecretCode: context.totpSecretCode,
                     username: context.username,
                     unverifiedUserAttributes: context.unverifiedUserAttributes,
+                    allowedMfaTypes: context.allowedMfaTypes,
                 }),
             },
         },

package/dist/esm/machines/authenticator/actors/utils.mjs

@@ -6,5 +6,17 @@ const getFederatedSignInState = (target) => ({
         onError: { actions: 'setRemoteError', target },
     },
 });
+const getConfirmSignInFormValuesKey = (signInStep) => {
+    if ([
+        'CONTINUE_SIGN_IN_WITH_MFA_SELECTION',
+        'CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTION',
+    ].includes(signInStep)) {
+        return 'mfa_type';
+    }
+    if (signInStep === 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUP') {
+        return 'email';
+    }
+    return 'confirmation_code';
+};
 
-export { getFederatedSignInState };
+export { getConfirmSignInFormValuesKey, getFederatedSignInState };

package/dist/esm/machines/authenticator/guards.mjs

@@ -1,6 +1,7 @@
 const SIGN_IN_STEP_MFA_CONFIRMATION = [
     'CONFIRM_SIGN_IN_WITH_SMS_CODE',
     'CONFIRM_SIGN_IN_WITH_TOTP_CODE',
+    'CONFIRM_SIGN_IN_WITH_EMAIL_CODE',
 ];
 // response next step guards
 const shouldConfirmSignInWithNewPassword = (_, { data }) => data?.nextStep.signInStep ===
@@ -20,12 +21,21 @@ const isConfirmSignUpStep = (_, { data }) => data?.step === 'CONFIRM_SIGN_UP';
 // actor entry guards read `step` from actor context
 const shouldConfirmSignIn = ({ step }) => SIGN_IN_STEP_MFA_CONFIRMATION.includes(step);
 const shouldSetupTotp = ({ step }) => step === 'CONTINUE_SIGN_IN_WITH_TOTP_SETUP';
+const shouldSetupEmail = ({ step }) => step === 'CONTINUE_SIGN_IN_WITH_EMAIL_SETUP';
+const shouldSelectMfaType = ({ step }) => [
+    'CONTINUE_SIGN_IN_WITH_MFA_SELECTION',
+    'CONTINUE_SIGN_IN_WITH_MFA_SETUP_SELECTION',
+].includes(step);
 const shouldResetPassword = ({ step }) => step === 'RESET_PASSWORD';
 const shouldConfirmResetPassword = ({ step }) => step === 'CONFIRM_RESET_PASSWORD_WITH_CODE';
 const shouldConfirmSignUp = ({ step }) => step === 'CONFIRM_SIGN_UP';
 // miscellaneous guards
 const shouldVerifyAttribute = (_, { data }) => {
-    const { phone_number_verified, email_verified } = data;
+    const { email, phone_number, phone_number_verified, email_verified } = data;
+    // if neither email nor phone_number exist
+    // there is nothing to verify
+    if (!email && !phone_number)
+        return false;
     // email/phone_verified is returned as a string
     const emailNotVerified = email_verified === undefined || email_verified === 'false';
     const phoneNotVerified = phone_number_verified === undefined || phone_number_verified === 'false';
@@ -64,6 +74,8 @@ const GUARDS = {
     shouldResetPassword,
     shouldResetPasswordFromSignIn,
     shouldSetupTotp,
+    shouldSetupEmail,
+    shouldSelectMfaType,
     shouldVerifyAttribute,
 };
 

package/dist/esm/machines/authenticator/index.mjs

@@ -275,7 +275,7 @@ function createAuthenticatorMachine(options) {
                 { cond: 'hasActor', actions: forwardTo(({ actorRef }) => actorRef) },
             ]),
             setActorDoneData: assign({
-                actorDoneData: (context, event) => ({
+                actorDoneData: (_, event) => ({
                     challengeName: event.data.challengeName,
                     codeDeliveryDetails: event.data.codeDeliveryDetails,
                     missingAttributes: event.data.missingAttributes,
@@ -284,6 +284,7 @@ function createAuthenticatorMachine(options) {
                     step: event.data.step,
                     totpSecretCode: event.data.totpSecretCode,
                     unverifiedUserAttributes: event.data.unverifiedUserAttributes,
+                    allowedMfaTypes: event.data.allowedMfaTypes,
                 }),
             }),
             applyAmplifyConfig: assign({

package/dist/esm/utils/utils.mjs

@@ -184,7 +184,7 @@ const classNameModifierByFlag = (base, modifier, flag) => {
  * @returns formatted string array
  */
 function templateJoin(values, template) {
-    return values.reduce((acc, curr) => `${acc}${isString(curr) ? template(curr) : ''}`, '');
+    return values.reduce((acc, curr, index) => `${acc}${isString(curr) ? template(curr, index, values) : ''}`, '');
 }
 /**
  * A function that does nothing