@aws-amplify/ui 6.0.8 → 6.0.10

package/dist/esm/helpers/authenticator/getRoute.mjs

@@ -1,4 +1,15 @@
 const getRoute = (state, actorState) => {
+    // 'federatedSignIn' exists as a state on both the 'signInActor' and 'signUpActor',
+    // match against the `actorState` initially to determine if the federated sign in flow
+    // has begun, then which actor has begun the flow and return the corresponding `route`
+    if (actorState?.matches('federatedSignIn')) {
+        if (state.matches('signUpActor')) {
+            return 'signUp';
+        }
+        if (state.matches('signInActor')) {
+            return 'signIn';
+        }
+    }
     switch (true) {
         case state.matches('idle'):
             return 'idle';
@@ -17,7 +28,6 @@ const getRoute = (state, actorState) => {
         case actorState?.matches('setupTotp.submit'):
             return 'setupTotp';
         case actorState?.matches('signIn'):
-        case actorState?.matches('federatedSignIn'):
             return 'signIn';
         case actorState?.matches('signUp'):
         case actorState?.matches('autoSignIn'):

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

@@ -4,6 +4,7 @@ import { runValidators } from '../../../validators/index.mjs';
 import ACTIONS from '../actions.mjs';
 import { defaultServices } from '../defaultServices.mjs';
 import GUARDS from '../guards.mjs';
+import { getFederatedSignInState } from './utils.mjs';
 
 const handleSignInResponse = {
     onDone: [
@@ -83,13 +84,7 @@ function signInActor({ services }) {
                     { target: 'signIn' },
                 ],
             },
-            federatedSignIn: {
-                entry: ['sendUpdate', 'clearError'],
-                invoke: {
-                    src: 'signInWithRedirect',
-                    onError: { actions: 'setRemoteError' },
-                },
-            },
+            federatedSignIn: getFederatedSignInState('signIn'),
             fetchUserAttributes: {
                 invoke: {
                     src: 'fetchUserAttributes',

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

@@ -4,6 +4,7 @@ import { getSignUpInput } from '../utils.mjs';
 import { runValidators } from '../../../validators/index.mjs';
 import ACTIONS from '../actions.mjs';
 import GUARDS from '../guards.mjs';
+import { getFederatedSignInState } from './utils.mjs';
 
 const handleResetPasswordResponse = {
     onDone: [
@@ -90,6 +91,7 @@ function signUpActor({ services }) {
                     ...handleFetchUserAttributesResponse,
                 },
             },
+            federatedSignIn: getFederatedSignInState('signUp'),
             resetPassword: {
                 invoke: { src: 'resetPassword', ...handleResetPasswordResponse },
             },
@@ -115,6 +117,9 @@ function signUpActor({ services }) {
             signUp: {
                 type: 'parallel',
                 exit: 'clearTouched',
+                on: {
+                    FEDERATED_SIGN_IN: { target: 'federatedSignIn' },
+                },
                 states: {
                     validation: {
                         initial: 'pending',
@@ -133,8 +138,8 @@ function signUpActor({ services }) {
                             invalid: { entry: 'sendUpdate' },
                         },
                         on: {
-                            CHANGE: { actions: 'handleInput', target: '.pending' },
                             BLUR: { actions: 'handleBlur', target: '.pending' },
+                            CHANGE: { actions: 'handleInput', target: '.pending' },
                         },
                     },
                     submission: {
@@ -144,14 +149,6 @@ function signUpActor({ services }) {
                                 entry: ['sendUpdate'],
                                 on: {
                                     SUBMIT: { actions: 'handleSubmit', target: 'validate' },
-                                    FEDERATED_SIGN_IN: 'federatedSignIn',
-                                },
-                            },
-                            federatedSignIn: {
-                                entry: ['sendUpdate', 'clearError'],
-                                invoke: {
-                                    src: 'federatedSignIn',
-                                    onError: { actions: 'setRemoteError' },
                                 },
                             },
                             validate: {
@@ -159,13 +156,13 @@ function signUpActor({ services }) {
                                 invoke: {
                                     src: 'validateSignUp',
                                     onDone: {
-                                        target: 'signUp',
+                                        target: 'handleSignUp',
                                         actions: 'clearValidationError',
                                     },
                                     onError: { actions: 'setFieldErrors', target: 'idle' },
                                 },
                             },
-                            signUp: {
+                            handleSignUp: {
                                 tags: 'pending',
                                 entry: ['setUsernameSignUp', 'clearError'],
                                 exit: 'sendUpdate',
@@ -268,10 +265,10 @@ function signUpActor({ services }) {
             resendSignUpCode({ username }) {
                 return resendSignUpCode({ username });
             },
-            async federatedSignIn(_, { data }) {
+            signInWithRedirect(_, { data }) {
                 return signInWithRedirect(data);
             },
-            async handleSignUp(context) {
+            handleSignUp(context) {
                 const { formValues, loginMechanisms, username } = context;
                 const loginMechanism = loginMechanisms[0];
                 const input = getSignUpInput(username, formValues, loginMechanism);

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

@@ -0,0 +1,10 @@
+const getFederatedSignInState = (target) => ({
+    entry: ['sendUpdate', 'clearError'],
+    invoke: {
+        src: 'signInWithRedirect',
+        onDone: { target },
+        onError: { actions: 'setRemoteError', target },
+    },
+});
+
+export { getFederatedSignInState };

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

@@ -31,7 +31,7 @@ const stopActor = (machineId) => stop(machineId);
 const LEGACY_WAIT_CONFIG = {
     on: {
         INIT: {
-            actions: ['configure'],
+            actions: 'configure',
             target: 'getConfig',
         },
         SIGN_OUT: '#authenticator.signOut',
@@ -39,7 +39,7 @@ const LEGACY_WAIT_CONFIG = {
 };
 // setup step proceeds directly to configure
 const NEXT_WAIT_CONFIG = {
-    always: { actions: ['configure'], target: 'getConfig' },
+    always: { actions: 'configure', target: 'getConfig' },
 };
 function createAuthenticatorMachine(options) {
     const { useNextWaitConfig, ...overrideConfigServices } = options ?? {};
@@ -165,6 +165,11 @@ function createAuthenticatorMachine(options) {
                             cond: 'hasCompletedAttributeConfirmation',
                             target: '#authenticator.getCurrentUser',
                         },
+                        {
+                            cond: 'isShouldConfirmUserAttributeStep',
+                            actions: 'setActorDoneData',
+                            target: '#authenticator.verifyUserAttributesActor',
+                        },
                         {
                             cond: 'isConfirmUserAttributeStep',
                             target: '#authenticator.verifyUserAttributesActor',
@@ -238,10 +243,7 @@ function createAuthenticatorMachine(options) {
                 initial: 'spawnActor',
                 states: {
                     spawnActor: {
-                        always: {
-                            actions: 'spawnSignOutActor',
-                            target: 'runActor',
-                        },
+                        always: { actions: 'spawnSignOutActor', target: 'runActor' },
                     },
                     runActor: {
                         entry: 'clearActorDoneData',

package/dist/index.js

@@ -2345,6 +2345,17 @@ const NAVIGABLE_ROUTE_EVENT = {
 };
 
 const getRoute = (state, actorState) => {
+    // 'federatedSignIn' exists as a state on both the 'signInActor' and 'signUpActor',
+    // match against the `actorState` initially to determine if the federated sign in flow
+    // has begun, then which actor has begun the flow and return the corresponding `route`
+    if (actorState?.matches('federatedSignIn')) {
+        if (state.matches('signUpActor')) {
+            return 'signUp';
+        }
+        if (state.matches('signInActor')) {
+            return 'signIn';
+        }
+    }
     switch (true) {
         case state.matches('idle'):
             return 'idle';
@@ -2363,7 +2374,6 @@ const getRoute = (state, actorState) => {
         case actorState?.matches('setupTotp.submit'):
             return 'setupTotp';
         case actorState?.matches('signIn'):
-        case actorState?.matches('federatedSignIn'):
             return 'signIn';
         case actorState?.matches('signUp'):
         case actorState?.matches('autoSignIn'):
@@ -3883,6 +3893,15 @@ function forgotPasswordActor({ services, }) {
     });
 }
 
+const getFederatedSignInState = (target) => ({
+    entry: ['sendUpdate', 'clearError'],
+    invoke: {
+        src: 'signInWithRedirect',
+        onDone: { target },
+        onError: { actions: 'setRemoteError', target },
+    },
+});
+
 const handleSignInResponse = {
     onDone: [
         {
@@ -3961,13 +3980,7 @@ function signInActor({ services }) {
                     { target: 'signIn' },
                 ],
             },
-            federatedSignIn: {
-                entry: ['sendUpdate', 'clearError'],
-                invoke: {
-                    src: 'signInWithRedirect',
-                    onError: { actions: 'setRemoteError' },
-                },
-            },
+            federatedSignIn: getFederatedSignInState('signIn'),
             fetchUserAttributes: {
                 invoke: {
                     src: 'fetchUserAttributes',
@@ -4288,6 +4301,7 @@ function signUpActor({ services }) {
                     ...handleFetchUserAttributesResponse,
                 },
             },
+            federatedSignIn: getFederatedSignInState('signUp'),
             resetPassword: {
                 invoke: { src: 'resetPassword', ...handleResetPasswordResponse },
             },
@@ -4313,6 +4327,9 @@ function signUpActor({ services }) {
             signUp: {
                 type: 'parallel',
                 exit: 'clearTouched',
+                on: {
+                    FEDERATED_SIGN_IN: { target: 'federatedSignIn' },
+                },
                 states: {
                     validation: {
                         initial: 'pending',
@@ -4331,8 +4348,8 @@ function signUpActor({ services }) {
                             invalid: { entry: 'sendUpdate' },
                         },
                         on: {
-                            CHANGE: { actions: 'handleInput', target: '.pending' },
                             BLUR: { actions: 'handleBlur', target: '.pending' },
+                            CHANGE: { actions: 'handleInput', target: '.pending' },
                         },
                     },
                     submission: {
@@ -4342,14 +4359,6 @@ function signUpActor({ services }) {
                                 entry: ['sendUpdate'],
                                 on: {
                                     SUBMIT: { actions: 'handleSubmit', target: 'validate' },
-                                    FEDERATED_SIGN_IN: 'federatedSignIn',
-                                },
-                            },
-                            federatedSignIn: {
-                                entry: ['sendUpdate', 'clearError'],
-                                invoke: {
-                                    src: 'federatedSignIn',
-                                    onError: { actions: 'setRemoteError' },
                                 },
                             },
                             validate: {
@@ -4357,13 +4366,13 @@ function signUpActor({ services }) {
                                 invoke: {
                                     src: 'validateSignUp',
                                     onDone: {
-                                        target: 'signUp',
+                                        target: 'handleSignUp',
                                         actions: 'clearValidationError',
                                     },
                                     onError: { actions: 'setFieldErrors', target: 'idle' },
                                 },
                             },
-                            signUp: {
+                            handleSignUp: {
                                 tags: 'pending',
                                 entry: ['setUsernameSignUp', 'clearError'],
                                 exit: 'sendUpdate',
@@ -4466,10 +4475,10 @@ function signUpActor({ services }) {
             resendSignUpCode({ username }) {
                 return auth.resendSignUpCode({ username });
             },
-            async federatedSignIn(_, { data }) {
+            signInWithRedirect(_, { data }) {
                 return auth.signInWithRedirect(data);
             },
-            async handleSignUp(context) {
+            handleSignUp(context) {
                 const { formValues, loginMechanisms, username } = context;
                 const loginMechanism = loginMechanisms[0];
                 const input = getSignUpInput(username, formValues, loginMechanism);
@@ -4634,7 +4643,7 @@ const stopActor = (machineId) => stop(machineId);
 const LEGACY_WAIT_CONFIG = {
     on: {
         INIT: {
-            actions: ['configure'],
+            actions: 'configure',
             target: 'getConfig',
         },
         SIGN_OUT: '#authenticator.signOut',
@@ -4642,7 +4651,7 @@ const LEGACY_WAIT_CONFIG = {
 };
 // setup step proceeds directly to configure
 const NEXT_WAIT_CONFIG = {
-    always: { actions: ['configure'], target: 'getConfig' },
+    always: { actions: 'configure', target: 'getConfig' },
 };
 function createAuthenticatorMachine(options) {
     const { useNextWaitConfig, ...overrideConfigServices } = options ?? {};
@@ -4768,6 +4777,11 @@ function createAuthenticatorMachine(options) {
                             cond: 'hasCompletedAttributeConfirmation',
                             target: '#authenticator.getCurrentUser',
                         },
+                        {
+                            cond: 'isShouldConfirmUserAttributeStep',
+                            actions: 'setActorDoneData',
+                            target: '#authenticator.verifyUserAttributesActor',
+                        },
                         {
                             cond: 'isConfirmUserAttributeStep',
                             target: '#authenticator.verifyUserAttributesActor',
@@ -4841,10 +4855,7 @@ function createAuthenticatorMachine(options) {
                 initial: 'spawnActor',
                 states: {
                     spawnActor: {
-                        always: {
-                            actions: 'spawnSignOutActor',
-                            target: 'runActor',
-                        },
+                        always: { actions: 'spawnSignOutActor', target: 'runActor' },
                     },
                     runActor: {
                         entry: 'clearActorDoneData',

package/dist/types/helpers/authenticator/debugUtils.d.ts

@@ -0,0 +1,11 @@
+import { GetRoute } from './getRoute';
+/**
+ * @internal Not to be used in production
+ * @description Debugging tool for logging `state` and `actorState`
+ *
+ * @example
+ * ```ts
+ * const getRouteWithLogs = logRouteChanges(getRoute);
+ * ```
+ */
+export declare const logRouteChanges: (fn: GetRoute) => GetRoute;

package/dist/types/helpers/authenticator/getRoute.d.ts

@@ -1,2 +1,4 @@
 import { AuthActorState, AuthMachineState } from '../../machines/authenticator/types';
-export declare const getRoute: (state: AuthMachineState, actorState: AuthActorState) => "signIn" | "signUp" | "forceNewPassword" | "confirmResetPassword" | "confirmSignIn" | "confirmSignUp" | "confirmVerifyUser" | "forgotPassword" | "setupTotp" | "idle" | "setup" | "signOut" | "authenticated" | "verifyUser" | "transition";
+import { AuthenticatorRoute } from './facade';
+export type GetRoute = (state: AuthMachineState, actorState: AuthActorState) => AuthenticatorRoute;
+export declare const getRoute: (state: AuthMachineState, actorState: AuthActorState) => AuthenticatorRoute;

package/dist/types/machines/authenticator/actors/utils.d.ts

@@ -0,0 +1,13 @@
+export declare const getFederatedSignInState: (target: 'signIn' | 'signUp') => {
+    entry: string[];
+    invoke: {
+        src: string;
+        onDone: {
+            target: "signIn" | "signUp";
+        };
+        onError: {
+            actions: string;
+            target: "signIn" | "signUp";
+        };
+    };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/ui",
-  "version": "6.0.8",
+  "version": "6.0.10",
   "main": "dist/index.js",
   "module": "dist/esm/index.mjs",
   "exports": {