@aws-amplify/ui 6.0.5 → 6.0.6

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

@@ -7,7 +7,7 @@ import { isFunction } from '../../utils/utils.mjs';
  * Handles Amplify JS Auth hub events, by forwarding hub events as appropriate
  * xstate events.
  */
-const defaultAuthHubHandler = async ({ payload }, service, options) => {
+const defaultAuthHubHandler = ({ payload }, service, options) => {
     const { event } = payload;
     const { send } = service;
     const { onSignIn, onSignOut } = options ?? {};
@@ -32,21 +32,17 @@ const defaultAuthHubHandler = async ({ payload }, service, options) => {
         }
     }
 };
-const getHubEventHandler = (service, handler) => (data) => {
-    handler(data, service);
-};
 /**
  * Listens to external auth Hub events and sends corresponding event to
- * the `authService` of interest
- *
- * @param send - `send` function associated with the `authService` of interest
+ * the `service.send` of interest
  *
+ * @param service - contains state machine `send` function
+ * @param handler - auth event handler
  * @returns function that unsubscribes to the hub evenmt
  */
-const listenToAuthHub = (service, 
-// angular passes its own `handler` param
-handler = defaultAuthHubHandler) => {
-    return Hub.listen('auth', getHubEventHandler(service, handler), 'authenticator-hub-handler');
+const listenToAuthHub = (service, handler = defaultAuthHubHandler) => {
+    const eventHandler = (data) => handler(data, service);
+    return Hub.listen('auth', eventHandler, 'authenticator-hub-handler');
 };
 
 export { defaultAuthHubHandler, listenToAuthHub };

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

@@ -10,6 +10,17 @@ import '../../helpers/accountSettings/utils.mjs';
 
 // Cognito does not allow a password length less then 8 characters
 const DEFAULT_COGNITO_PASSWORD_MIN_LENGTH = 8;
+const isInvalidUserAtributes = (userAttributes) => Array.isArray(userAttributes);
+const parseUserAttributes = (userAttributes) => {
+    if (!userAttributes) {
+        return undefined;
+    }
+    // `aws-amplify` versions <= 6.0.5 return an array of `userAttributes` rather than an object
+    if (isInvalidUserAtributes(userAttributes)) {
+        return Object.entries(userAttributes).map(([_, value]) => Object.keys(value)[0]);
+    }
+    return Object.keys(userAttributes);
+};
 const defaultServices = {
     async getAmplifyConfig() {
         const result = Amplify.getConfig();
@@ -25,9 +36,7 @@ const defaultServices = {
                     : keyValueArray[0];
             })
             : undefined;
-        const parsedSignupAttributes = userAttributes
-            ? Object.entries(userAttributes).map(([_key, value]) => Object.keys(value)[0])
-            : undefined;
+        const parsedSignupAttributes = parseUserAttributes(userAttributes);
         const parsedSocialProviders = loginWith?.oauth?.providers
             ? loginWith.oauth.providers?.map((provider) => provider.toString().toLowerCase())
             : undefined;

package/dist/index.js

@@ -408,7 +408,7 @@ const classNames = (...args) => {
  * Handles Amplify JS Auth hub events, by forwarding hub events as appropriate
  * xstate events.
  */
-const defaultAuthHubHandler = async ({ payload }, service, options) => {
+const defaultAuthHubHandler = ({ payload }, service, options) => {
     const { event } = payload;
     const { send } = service;
     const { onSignIn, onSignOut } = options ?? {};
@@ -433,21 +433,17 @@ const defaultAuthHubHandler = async ({ payload }, service, options) => {
         }
     }
 };
-const getHubEventHandler = (service, handler) => (data) => {
-    handler(data, service);
-};
 /**
  * Listens to external auth Hub events and sends corresponding event to
- * the `authService` of interest
- *
- * @param send - `send` function associated with the `authService` of interest
+ * the `service.send` of interest
  *
+ * @param service - contains state machine `send` function
+ * @param handler - auth event handler
  * @returns function that unsubscribes to the hub evenmt
  */
-const listenToAuthHub = (service, 
-// angular passes its own `handler` param
-handler = defaultAuthHubHandler) => {
-    return utils$1.Hub.listen('auth', getHubEventHandler(service, handler), 'authenticator-hub-handler');
+const listenToAuthHub = (service, handler = defaultAuthHubHandler) => {
+    const eventHandler = (data) => handler(data, service);
+    return utils$1.Hub.listen('auth', eventHandler, 'authenticator-hub-handler');
 };
 
 const countryDialCodes = [
@@ -3611,6 +3607,17 @@ const runValidators = async (formData, touchData, passwordSettings, validators)
 
 // Cognito does not allow a password length less then 8 characters
 const DEFAULT_COGNITO_PASSWORD_MIN_LENGTH = 8;
+const isInvalidUserAtributes = (userAttributes) => Array.isArray(userAttributes);
+const parseUserAttributes = (userAttributes) => {
+    if (!userAttributes) {
+        return undefined;
+    }
+    // `aws-amplify` versions <= 6.0.5 return an array of `userAttributes` rather than an object
+    if (isInvalidUserAtributes(userAttributes)) {
+        return Object.entries(userAttributes).map(([_, value]) => Object.keys(value)[0]);
+    }
+    return Object.keys(userAttributes);
+};
 const defaultServices = {
     async getAmplifyConfig() {
         const result = awsAmplify.Amplify.getConfig();
@@ -3626,9 +3633,7 @@ const defaultServices = {
                     : keyValueArray[0];
             })
             : undefined;
-        const parsedSignupAttributes = userAttributes
-            ? Object.entries(userAttributes).map(([_key, value]) => Object.keys(value)[0])
-            : undefined;
+        const parsedSignupAttributes = parseUserAttributes(userAttributes);
         const parsedSocialProviders = loginWith?.oauth?.providers
             ? loginWith.oauth.providers?.map((provider) => provider.toString().toLowerCase())
             : undefined;

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

@@ -6,10 +6,10 @@ import { AuthInterpreter, AuthMachineHubHandler } from './types';
 export declare const defaultAuthHubHandler: AuthMachineHubHandler;
 /**
  * Listens to external auth Hub events and sends corresponding event to
- * the `authService` of interest
- *
- * @param send - `send` function associated with the `authService` of interest
+ * the `service.send` of interest
  *
+ * @param service - contains state machine `send` function
+ * @param handler - auth event handler
  * @returns function that unsubscribes to the hub evenmt
  */
 export declare const listenToAuthHub: (service: AuthInterpreter, handler?: AuthMachineHubHandler) => import("@aws-amplify/core/dist/esm/Hub/types").StopListenerCallback;

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

@@ -23,4 +23,4 @@ export type AuthMachineSend = AuthInterpreter['send'];
 export type AuthMachineHubHandler = (data: HubCapsule<any, any>, service: AuthInterpreter, options?: {
     onSignIn?: (user: AuthUser) => void;
     onSignOut?: () => void;
-}) => Promise<void>;
+}) => void;

package/dist/types/machines/authenticator/defaultServices.d.ts

@@ -1,9 +1,10 @@
+import { UserAttributeKey } from 'aws-amplify/auth';
 import { confirmResetPassword, confirmSignIn, confirmSignUp, resetPassword, signIn, signUp } from 'aws-amplify/auth';
-import { AuthFormData, AuthTouchData, PasswordSettings, SignUpAttribute, SocialProvider, ValidatorResult } from '../../types';
+import { AuthFormData, AuthTouchData, PasswordSettings, SocialProvider, ValidatorResult } from '../../types';
 export declare const defaultServices: {
     getAmplifyConfig(): Promise<{
         loginMechanisms: ("email" | "phone_number" | "username")[];
-        signUpAttributes: SignUpAttribute[];
+        signUpAttributes: UserAttributeKey[];
         socialProviders: SocialProvider[];
         identityPoolId: string;
         allowGuestAccess?: boolean;
@@ -17,7 +18,7 @@ export declare const defaultServices: {
         passwordFormat?: never;
     } | {
         loginMechanisms: ("email" | "phone_number" | "username")[];
-        signUpAttributes: SignUpAttribute[];
+        signUpAttributes: UserAttributeKey[];
         socialProviders: SocialProvider[];
         userPoolClientId: string;
         userPoolId: string;
@@ -48,7 +49,7 @@ export declare const defaultServices: {
         allowGuestAccess?: never;
     } | {
         loginMechanisms: ("email" | "phone_number" | "username")[];
-        signUpAttributes: SignUpAttribute[];
+        signUpAttributes: UserAttributeKey[];
         socialProviders: SocialProvider[];
         identityPoolId: never;
         allowGuestAccess?: never;
@@ -62,7 +63,7 @@ export declare const defaultServices: {
         passwordFormat?: never;
     } | {
         loginMechanisms: ("email" | "phone_number" | "username")[];
-        signUpAttributes: SignUpAttribute[];
+        signUpAttributes: UserAttributeKey[];
         socialProviders: SocialProvider[];
         identityPoolId: string;
         allowGuestAccess?: boolean;
@@ -76,7 +77,7 @@ export declare const defaultServices: {
         passwordFormat?: never;
     } | {
         loginMechanisms: ("email" | "phone_number" | "username")[];
-        signUpAttributes: SignUpAttribute[];
+        signUpAttributes: UserAttributeKey[];
         socialProviders: SocialProvider[];
         userPoolClientId: never;
         userPoolId: never;
@@ -90,7 +91,7 @@ export declare const defaultServices: {
         allowGuestAccess?: never;
     } | {
         loginMechanisms: ("email" | "phone_number" | "username")[];
-        signUpAttributes: SignUpAttribute[];
+        signUpAttributes: UserAttributeKey[];
         socialProviders: SocialProvider[];
         userPoolClientId: string;
         userPoolId: string;
@@ -121,7 +122,7 @@ export declare const defaultServices: {
         allowGuestAccess?: never;
     } | {
         loginMechanisms: ("email" | "phone_number" | "username")[];
-        signUpAttributes: SignUpAttribute[];
+        signUpAttributes: UserAttributeKey[];
         socialProviders: SocialProvider[];
         userPoolClientId: never;
         userPoolId: never;
@@ -135,7 +136,7 @@ export declare const defaultServices: {
         allowGuestAccess?: boolean;
     } | {
         loginMechanisms: ("email" | "phone_number" | "username")[];
-        signUpAttributes: SignUpAttribute[];
+        signUpAttributes: UserAttributeKey[];
         socialProviders: SocialProvider[];
         userPoolClientId: string;
         userPoolId: string;
@@ -166,7 +167,7 @@ export declare const defaultServices: {
         allowGuestAccess?: never;
     } | {
         loginMechanisms: ("email" | "phone_number" | "username")[];
-        signUpAttributes: SignUpAttribute[];
+        signUpAttributes: UserAttributeKey[];
         socialProviders: SocialProvider[];
         userPoolClientId: string;
         userPoolId: string;

package/package.json

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