@aws-amplify/notifications 2.0.21 → 2.0.22-unstable.1aafa48.0

package/dist/esm/pushNotifications/types/inputs.d.ts

@@ -2,7 +2,7 @@ import { UserProfile } from '@aws-amplify/core';
 import { PushNotificationServiceOptions } from './options';
 import { PushNotificationPermissions } from './module';
 import { OnPushNotificationMessageHandler, OnTokenReceivedHandler } from './pushNotifications';
-export type PushNotificationIdentifyUserInput<ServiceOptions extends PushNotificationServiceOptions = PushNotificationServiceOptions> = {
+export interface PushNotificationIdentifyUserInput<ServiceOptions extends PushNotificationServiceOptions = PushNotificationServiceOptions> {
     /**
      * A User ID associated to the current device.
      */
@@ -15,7 +15,7 @@ export type PushNotificationIdentifyUserInput<ServiceOptions extends PushNotific
      * Options to be passed to the API.
      */
     options?: ServiceOptions;
-};
+}
 export type PushNotificationRequestPermissionsInput = PushNotificationPermissions;
 export type PushNotificationSetBadgeCountInput = number;
 export type PushNotificationOnNotificationOpenedInput = OnPushNotificationMessageHandler;

package/dist/esm/pushNotifications/utils/resolveCredentials.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"resolveCredentials.mjs","sources":["../../../../src/pushNotifications/utils/resolveCredentials.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { fetchAuthSession } from '@aws-amplify/core';\nimport { assert, PushNotificationValidationErrorCode, } from '../errors/errorHelpers';\n/**\n * @internal\n */\nexport const resolveCredentials = async () => {\n    const { credentials, identityId } = await fetchAuthSession();\n    assert(!!credentials, PushNotificationValidationErrorCode.NoCredentials);\n    return { credentials, identityId };\n};\n"],"names":[],"mappings":";;;AAAA;AACA;AAGA;AACA;AACA;AACY,MAAC,kBAAkB,GAAG,YAAY;AAC9C,IAAI,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,gBAAgB,EAAE,CAAC;AACjE,IAAI,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,mCAAmC,CAAC,aAAa,CAAC,CAAC;AAC7E,IAAI,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;AACvC;;;;"}
+{"version":3,"file":"resolveCredentials.mjs","sources":["../../../../src/pushNotifications/utils/resolveCredentials.ts"],"sourcesContent":["// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n// SPDX-License-Identifier: Apache-2.0\nimport { fetchAuthSession } from '@aws-amplify/core';\nimport { PushNotificationValidationErrorCode, assert, } from '../errors/errorHelpers';\n/**\n * @internal\n */\nexport const resolveCredentials = async () => {\n    const { credentials, identityId } = await fetchAuthSession();\n    assert(!!credentials, PushNotificationValidationErrorCode.NoCredentials);\n    return { credentials, identityId };\n};\n"],"names":[],"mappings":";;;AAAA;AACA;AAGA;AACA;AACA;AACY,MAAC,kBAAkB,GAAG,YAAY;AAC9C,IAAI,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,gBAAgB,EAAE,CAAC;AACjE,IAAI,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,mCAAmC,CAAC,aAAa,CAAC,CAAC;AAC7E,IAAI,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC;AACvC;;;;"}

package/package.json

@@ -1,105 +1,106 @@
 {
-	"name": "@aws-amplify/notifications",
-	"version": "2.0.21",
-	"description": "Notifications category of aws-amplify",
-	"main": "./dist/cjs/index.js",
-	"module": "./dist/esm/index.mjs",
-	"react-native": "./src/index.ts",
-	"typings": "./dist/esm/index.d.ts",
-	"sideEffects": false,
-	"publishConfig": {
-		"access": "public"
-	},
-	"scripts": {
-		"test": "npm run lint && jest -w 1 --coverage --logHeapUsage",
-		"test:watch": "tslint 'src/**/*.ts' && jest -w 1 --watch",
-		"build-with-test": "npm run clean && npm run build",
-		"build:umd": "webpack && webpack --config ./webpack.config.dev.js",
-		"build:esm-cjs": "rollup -c rollup.config.mjs",
-		"build:watch": "npm run build:esm-cjs -- --watch",
-		"build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
-		"clean": "npm run clean:size && rimraf dist lib lib-esm",
-		"clean:size": "rimraf dual-publish-tmp tmp*",
-		"format": "echo \"Not implemented\"",
-		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
-		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 88.21"
-	},
-	"typesVersions": {
-		">=4.2": {
-			"in-app-messaging": [
-				"./dist/esm/inAppMessaging/index.d.ts"
-			],
-			"push-notifications": [
-				"./dist/esm/pushNotifications/providers/index.d.ts"
-			],
-			"in-app-messaging/pinpoint": [
-				"./dist/esm/inAppMessaging/providers/pinpoint/index.d.ts"
-			],
-			"push-notifications/pinpoint": [
-				"./dist/esm/pushNotifications/providers/pinpoint/index.d.ts"
-			]
-		}
-	},
-	"exports": {
-		".": {
-			"import": "./dist/esm/index.mjs",
-			"require": "./dist/cjs/index.js",
-			"react-native": "./src/index.ts"
-		},
-		"./in-app-messaging": {
-			"types": "./dist/esm/inAppMessaging/index.d.ts",
-			"import": "./dist/esm/inAppMessaging/index.mjs",
-			"require": "./dist/cjs/inAppMessaging/index.js",
-			"react-native": "./src/inAppMessaging/index.ts"
-		},
-		"./push-notifications": {
-			"types": "./dist/esm/pushNotifications/index.d.ts",
-			"import": "./dist/esm/pushNotifications/index.mjs",
-			"require": "./dist/cjs/pushNotifications/index.js",
-			"react-native": "./src/pushNotifications/index.ts"
-		},
-		"./in-app-messaging/pinpoint": {
-			"types": "./dist/esm/inAppMessaging/providers/pinpoint/index.d.ts",
-			"import": "./dist/esm/inAppMessaging/providers/pinpoint/index.mjs",
-			"require": "./dist/cjs/inAppMessaging/providers/pinpoint/index.js",
-			"react-native": "./src/inAppMessaging/providers/pinpoint/index.ts"
-		},
-		"./push-notifications/pinpoint": {
-			"types": "./dist/esm/pushNotifications/providers/pinpoint/index.d.ts",
-			"import": "./dist/esm/pushNotifications/providers/pinpoint/index.mjs",
-			"require": "./dist/cjs/pushNotifications/providers/pinpoint/index.js",
-			"react-native": "./src/pushNotifications/providers/pinpoint/index.ts"
-		},
-		"./package.json": "./package.json"
-	},
-	"repository": {
-		"type": "git",
-		"url": "https://github.com/aws-amplify/amplify-js.git"
-	},
-	"author": "Amazon Web Services",
-	"license": "Apache-2.0",
-	"bugs": {
-		"url": "https://github.com/aws/aws-amplify/issues"
-	},
-	"homepage": "https://docs.amplify.aws/",
-	"files": [
-		"dist/cjs",
-		"dist/esm",
-		"src",
-		"in-app-messaging",
-		"push-notifications"
-	],
-	"dependencies": {
-		"lodash": "^4.17.21",
-		"tslib": "^2.5.0"
-	},
-	"peerDependencies": {
-		"@aws-amplify/core": "^6.0.0"
-	},
-	"devDependencies": {
-		"@aws-amplify/core": "6.0.21",
-		"@aws-amplify/react-native": "1.0.22",
-		"typescript": "5.0.2"
-	},
-	"gitHead": "00f4046bc984c931c1a2a95d806e418e093d77d0"
+  "name": "@aws-amplify/notifications",
+  "version": "2.0.22-unstable.1aafa48.0+1aafa48",
+  "description": "Notifications category of aws-amplify",
+  "main": "./dist/cjs/index.js",
+  "module": "./dist/esm/index.mjs",
+  "react-native": "./src/index.ts",
+  "typings": "./dist/esm/index.d.ts",
+  "sideEffects": false,
+  "publishConfig": {
+    "access": "public"
+  },
+  "scripts": {
+    "test": "npm run lint && jest -w 1 --coverage --logHeapUsage",
+    "test:watch": "tslint 'src/**/*.ts' && jest -w 1 --watch",
+    "build-with-test": "npm run clean && npm run build",
+    "build:umd": "webpack && webpack --config ./webpack.config.dev.js",
+    "build:esm-cjs": "rollup -c rollup.config.mjs",
+    "build:watch": "npm run build:esm-cjs -- --watch",
+    "build": "npm run clean && npm run build:esm-cjs && npm run build:umd",
+    "clean": "npm run clean:size && rimraf dist lib lib-esm",
+    "clean:size": "rimraf dual-publish-tmp tmp*",
+    "format": "echo \"Not implemented\"",
+    "lint": "eslint '**/*.{ts,tsx}' && npm run ts-coverage",
+    "lint:fix": "eslint '**/*.{ts,tsx}' --fix",
+    "ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 88.21"
+  },
+  "typesVersions": {
+    ">=4.2": {
+      "in-app-messaging": [
+        "./dist/esm/inAppMessaging/index.d.ts"
+      ],
+      "push-notifications": [
+        "./dist/esm/pushNotifications/providers/index.d.ts"
+      ],
+      "in-app-messaging/pinpoint": [
+        "./dist/esm/inAppMessaging/providers/pinpoint/index.d.ts"
+      ],
+      "push-notifications/pinpoint": [
+        "./dist/esm/pushNotifications/providers/pinpoint/index.d.ts"
+      ]
+    }
+  },
+  "exports": {
+    ".": {
+      "import": "./dist/esm/index.mjs",
+      "require": "./dist/cjs/index.js",
+      "react-native": "./src/index.ts"
+    },
+    "./in-app-messaging": {
+      "types": "./dist/esm/inAppMessaging/index.d.ts",
+      "import": "./dist/esm/inAppMessaging/index.mjs",
+      "require": "./dist/cjs/inAppMessaging/index.js",
+      "react-native": "./src/inAppMessaging/index.ts"
+    },
+    "./push-notifications": {
+      "types": "./dist/esm/pushNotifications/index.d.ts",
+      "import": "./dist/esm/pushNotifications/index.mjs",
+      "require": "./dist/cjs/pushNotifications/index.js",
+      "react-native": "./src/pushNotifications/index.ts"
+    },
+    "./in-app-messaging/pinpoint": {
+      "types": "./dist/esm/inAppMessaging/providers/pinpoint/index.d.ts",
+      "import": "./dist/esm/inAppMessaging/providers/pinpoint/index.mjs",
+      "require": "./dist/cjs/inAppMessaging/providers/pinpoint/index.js",
+      "react-native": "./src/inAppMessaging/providers/pinpoint/index.ts"
+    },
+    "./push-notifications/pinpoint": {
+      "types": "./dist/esm/pushNotifications/providers/pinpoint/index.d.ts",
+      "import": "./dist/esm/pushNotifications/providers/pinpoint/index.mjs",
+      "require": "./dist/cjs/pushNotifications/providers/pinpoint/index.js",
+      "react-native": "./src/pushNotifications/providers/pinpoint/index.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/aws-amplify/amplify-js.git"
+  },
+  "author": "Amazon Web Services",
+  "license": "Apache-2.0",
+  "bugs": {
+    "url": "https://github.com/aws/aws-amplify/issues"
+  },
+  "homepage": "https://docs.amplify.aws/",
+  "files": [
+    "dist/cjs",
+    "dist/esm",
+    "src",
+    "in-app-messaging",
+    "push-notifications"
+  ],
+  "dependencies": {
+    "lodash": "^4.17.21",
+    "tslib": "^2.5.0"
+  },
+  "peerDependencies": {
+    "@aws-amplify/core": "6.0.22-unstable.1aafa48.0+1aafa48"
+  },
+  "devDependencies": {
+    "@aws-amplify/core": "6.0.22-unstable.1aafa48.0+1aafa48",
+    "@aws-amplify/react-native": "1.0.23-unstable.1aafa48.0+1aafa48",
+    "typescript": "5.0.2"
+  },
+  "gitHead": "1aafa4837c45b96d7c8fca5ddacf973097fac19e"
 }

package/src/eventListeners/eventListeners.ts

@@ -1,9 +1,17 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { EventListener, EventListenerRemover, EventType } from './types';
+import {
+	EventListener,
+	EventListenerHandler,
+	EventListenerRemover,
+	EventType,
+} from './types';
 
-const eventListeners: Record<string, Set<EventListener<Function>>> = {};
+const eventListeners: Record<
+	string,
+	Set<EventListener<EventListenerHandler>>
+> = {};
 
 export const notifyEventListeners = (type: EventType, ...args: any[]): void => {
 	eventListeners[type]?.forEach(listener => {
@@ -17,15 +25,11 @@ export const notifyEventListenersAndAwaitHandlers = (
 ): Promise<void[]> =>
 	Promise.all<void>(
 		Array.from(eventListeners[type] ?? []).map(async listener => {
-			try {
-				await listener.handleEvent(...args);
-			} catch (err) {
-				throw err;
-			}
+			await listener.handleEvent(...args);
 		}),
 	);
 
-export const addEventListener = <EventHandler extends Function>(
+export const addEventListener = <EventHandler extends EventListenerHandler>(
 	type: EventType,
 	handler: EventHandler,
 ): EventListenerRemover => {
@@ -40,7 +44,10 @@ export const addEventListener = <EventHandler extends Function>(
 		},
 	};
 	eventListeners[type].add(listener);
+
 	return {
-		remove: () => listener.remove(),
+		remove: () => {
+			listener.remove();
+		},
 	};
 };

package/src/eventListeners/types.ts

@@ -4,13 +4,15 @@
 import { InAppMessageInteractionEvent } from '../inAppMessaging/types';
 import { PushNotificationEvent } from '../pushNotifications/types';
 
-export interface EventListener<EventHandler extends Function> {
+export type EventListenerHandler = (...args: any[]) => unknown;
+
+export interface EventListener<EventHandler extends EventListenerHandler> {
 	handleEvent: EventHandler;
-	remove: () => void;
+	remove(): void;
 }
 
 export type EventType = InAppMessageInteractionEvent | PushNotificationEvent;
 
-export type EventListenerRemover = {
-	remove: () => void;
-};
+export interface EventListenerRemover {
+	remove(): void;
+}

package/src/inAppMessaging/errors/assertServiceError.ts

@@ -5,6 +5,7 @@ import {
 	AmplifyErrorCode,
 	ServiceError,
 } from '@aws-amplify/core/internals/utils';
+
 import { InAppMessagingError } from './InAppMessagingError';
 
 export function assertServiceError(

package/src/inAppMessaging/providers/pinpoint/apis/clearMessages.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { defaultStorage } from '@aws-amplify/core';
-import { STORAGE_KEY_SUFFIX, PINPOINT_KEY_PREFIX } from '../utils';
 
+import { PINPOINT_KEY_PREFIX, STORAGE_KEY_SUFFIX } from '../utils';
 import { InAppMessagingValidationErrorCode } from '../../../errors';
 import { assertIsInitialized } from '../../../utils';
 
@@ -22,5 +22,6 @@ import { assertIsInitialized } from '../../../utils';
 export async function clearMessages(): Promise<void> {
 	assertIsInitialized();
 	const key = `${PINPOINT_KEY_PREFIX}${STORAGE_KEY_SUFFIX}`;
-	return await defaultStorage.removeItem(key);
+
+	await defaultStorage.removeItem(key);
 }

package/src/inAppMessaging/providers/pinpoint/apis/dispatchEvent.ts

@@ -1,20 +1,26 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+import flatten from 'lodash/flatten.js';
+import { defaultStorage } from '@aws-amplify/core';
+
+import { notifyEventListeners } from '../../../../eventListeners';
+import {
+	InAppMessagingValidationErrorCode,
+	assertServiceError,
+} from '../../../errors';
+import { InAppMessage } from '../../../types';
+import { assertIsInitialized } from '../../../utils';
+import { DispatchEventInput } from '../types';
 import {
 	PINPOINT_KEY_PREFIX,
 	STORAGE_KEY_SUFFIX,
+	getConflictHandler,
 	processInAppMessages,
 } from '../utils';
-import { InAppMessage } from '../../../types';
-import flatten from 'lodash/flatten.js';
-import { defaultStorage } from '@aws-amplify/core';
-import { notifyEventListeners } from '../../../../eventListeners';
-import { assertServiceError } from '../../../errors';
-import { DispatchEventInput } from '../types';
+
 import { syncMessages } from './syncMessages';
-import { conflictHandler, setConflictHandler } from './setConflictHandler';
-import { assertIsInitialized } from '../../../utils';
+import { setConflictHandler } from './setConflictHandler';
 
 /**
  * Triggers an In-App message to be displayed. Use this after your campaigns have been synced to the device using
@@ -27,13 +33,13 @@ import { assertIsInitialized } from '../../../utils';
  * your own logic for resolving message conflicts.
  *
  * @param input The input object that holds the event to be dispatched.
- * 
+ *
  * @throws validation: {@link InAppMessagingValidationErrorCode} - Thrown when the provided parameters or library
  * configuration is incorrect, or if In App messaging hasn't been initialized.
  * @throws service exceptions - Thrown when the underlying Pinpoint service returns an error.
- * 
+ *
  * @returns A promise that will resolve when the operation is complete.
- * 
+ *
  * @example
  * ```ts
  * // Sync message before disptaching an event
@@ -54,6 +60,7 @@ export async function dispatchEvent(input: DispatchEventInput): Promise<void> {
 		);
 		const flattenedMessages = flatten(messages);
 		if (flattenedMessages.length > 0) {
+			const conflictHandler = getConflictHandler();
 			notifyEventListeners(
 				'messageReceived',
 				conflictHandler(flattenedMessages),

package/src/inAppMessaging/providers/pinpoint/apis/identifyUser.ts

@@ -3,9 +3,10 @@
 
 import { InAppMessagingAction } from '@aws-amplify/core/internals/utils';
 import {
-	updateEndpoint,
 	UpdateEndpointException,
+	updateEndpoint,
 } from '@aws-amplify/core/internals/providers/pinpoint';
+
 import { InAppMessagingValidationErrorCode } from '../../../errors';
 import {
 	CATEGORY,
@@ -22,7 +23,7 @@ import { assertIsInitialized } from '../../../utils';
  * profile and activities or actions in your application. Activity can be tracked across devices & platforms by using
  * the same `userId`.
  *
- * @param {IdentifyUserParameters} params The input object used to construct requests sent to Pinpoint's UpdateEndpoint
+ * @param input The input object that conforms to {@link IdentifyUserInput} used to construct requests sent to Pinpoint's UpdateEndpoint
  *  API.
  * @throws service: {@link UpdateEndpointException} - Thrown when the underlying Pinpoint service returns an error.
  * @throws validation: {@link InAppMessagingValidationErrorCode} - Thrown when the provided parameters or library
@@ -66,11 +67,8 @@ import { assertIsInitialized } from '../../../utils';
  *     },
  * });
  */
-export const identifyUser = async ({
-	userId,
-	userProfile,
-	options,
-}: IdentifyUserInput): Promise<void> => {
+export const identifyUser = async (input: IdentifyUserInput): Promise<void> => {
+	const { userId, userProfile, options } = input;
 	assertIsInitialized();
 	const { credentials, identityId } = await resolveCredentials();
 	const { appId, region } = resolveConfig();

package/src/inAppMessaging/providers/pinpoint/apis/initializeInAppMessaging.ts

@@ -2,14 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { sessionListener } from '@aws-amplify/core/internals/utils';
+import { Hub, HubCapsule } from '@aws-amplify/core';
+
 import { InAppMessage, InAppMessagingEvent } from '../../../types';
 import { addEventListener } from '../../../../eventListeners';
 import { recordAnalyticsEvent } from '../utils/helpers';
 import { PinpointMessageEvent } from '../types';
-import { Hub, HubCapsule } from '@aws-amplify/core';
-import { dispatchEvent } from './dispatchEvent';
 import { incrementMessageCounts, sessionStateChangeHandler } from '../utils';
-import { isInitialized, initialize } from '../../../utils';
+import { initialize, isInitialized } from '../../../utils';
+
+import { dispatchEvent } from './dispatchEvent';
 
 /**
  * Initialize and set up in-app messaging category. This API needs to be called to enable other InAppMessaging APIs.

package/src/inAppMessaging/providers/pinpoint/apis/notifyMessageInteraction.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { notifyEventListeners } from '../../../../eventListeners';
+import { InAppMessagingValidationErrorCode } from '../../../errors';
 import { assertIsInitialized } from '../../../utils';
 import { NotifyMessageInteractionInput } from '../types/inputs';
 

package/src/inAppMessaging/providers/pinpoint/apis/onMessageActionTaken.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { addEventListener } from '../../../../eventListeners';
+import { InAppMessagingValidationErrorCode } from '../../../errors';
 import { assertIsInitialized } from '../../../utils';
 import { OnMessageActionTakenInput } from '../types/inputs';
 import { OnMessageActionTakenOutput } from '../types/outputs';
@@ -25,5 +26,6 @@ export function onMessageActionTaken(
 	input: OnMessageActionTakenInput,
 ): OnMessageActionTakenOutput {
 	assertIsInitialized();
+
 	return addEventListener('messageActionTaken', input);
 }

package/src/inAppMessaging/providers/pinpoint/apis/onMessageDismissed.ts

@@ -5,6 +5,7 @@ import { addEventListener } from '../../../../eventListeners';
 import { OnMessageDismissedOutput } from '../types/outputs';
 import { OnMessageDismissedInput } from '../types/inputs';
 import { assertIsInitialized } from '../../../utils';
+import { InAppMessagingValidationErrorCode } from '../../../errors';
 
 /**
  * Registers a callback that will be invoked on `messageDismissed` events.
@@ -25,5 +26,6 @@ export function onMessageDismissed(
 	input: OnMessageDismissedInput,
 ): OnMessageDismissedOutput {
 	assertIsInitialized();
+
 	return addEventListener('messageDismissed', input);
 }

package/src/inAppMessaging/providers/pinpoint/apis/onMessageDisplayed.ts

@@ -5,6 +5,7 @@ import { addEventListener } from '../../../../eventListeners';
 import { OnMessageDisplayedOutput } from '../types/outputs';
 import { OnMessageDisplayedInput } from '../types/inputs';
 import { assertIsInitialized } from '../../../utils';
+import { InAppMessagingValidationErrorCode } from '../../../errors';
 
 /**
  * Registers a callback that will be invoked on `messageDisplayed` events.
@@ -12,7 +13,7 @@ import { assertIsInitialized } from '../../../utils';
  * @param {OnMessageDisplayedInput} input - The input object that holds the callback handler.
  * @throws validation: {@link InAppMessagingValidationErrorCode} - Thrown when the provided parameters or library
  * configuration is incorrect, or if In App messaging hasn't been initialized.
- * @returns {OnMessageDismissedOutput} - An object that holds a remove method to stop listening to events.
+ * @returns {OnMessageDisplayedOutput} - An object that holds a remove method to stop listening to events.
  * @example
  * ```ts
  * onMessageDisplayed((message) => {
@@ -25,5 +26,6 @@ export function onMessageDisplayed(
 	input: OnMessageDisplayedInput,
 ): OnMessageDisplayedOutput {
 	assertIsInitialized();
+
 	return addEventListener('messageDisplayed', input);
 }

package/src/inAppMessaging/providers/pinpoint/apis/onMessageReceived.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { addEventListener } from '../../../../eventListeners';
+import { InAppMessagingValidationErrorCode } from '../../../errors';
 import { assertIsInitialized } from '../../../utils';
 import { OnMessageReceivedInput } from '../types/inputs';
 import { OnMessageReceivedOutput } from '../types/outputs';
@@ -25,5 +26,6 @@ export function onMessageReceived(
 	input: OnMessageReceivedInput,
 ): OnMessageReceivedOutput {
 	assertIsInitialized();
+
 	return addEventListener('messageReceived', input);
 }

package/src/inAppMessaging/providers/pinpoint/apis/setConflictHandler.ts

@@ -1,12 +1,10 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { InAppMessage } from '../../../types';
+import { InAppMessagingValidationErrorCode } from '../../../errors';
 import { assertIsInitialized } from '../../../utils';
-import { InAppMessageConflictHandler, SetConflictHandlerInput } from '../types';
-
-export let conflictHandler: InAppMessageConflictHandler =
-	defaultConflictHandler;
+import { SetConflictHandlerInput } from '../types';
+import { setConflictHandler as setConflictHandlerInteral } from '../utils';
 
 /**
  * Set a conflict handler that will be used to resolve conflicts that may emerge
@@ -15,12 +13,12 @@ export let conflictHandler: InAppMessageConflictHandler =
  * @remark
  * The conflict handler is not persisted across app restarts and so must be set again before dispatching an event for
  * any custom handling to take effect.
- * 
+ *
  * @throws validation: {@link InAppMessagingValidationErrorCode} - Thrown when the provided parameters or library
  * configuration is incorrect, or if In App messaging hasn't been initialized.
- * 
+ *
  * @param input The input object that holds the conflict handler to be used.
- * 
+ *
  * @example
  * ```ts
  * // Sync messages before dispatching an event
@@ -42,30 +40,5 @@ export let conflictHandler: InAppMessageConflictHandler =
  */
 export function setConflictHandler(input: SetConflictHandlerInput): void {
 	assertIsInitialized();
-	conflictHandler = input;
-}
-
-function defaultConflictHandler(messages: InAppMessage[]): InAppMessage {
-	// default behavior is to return the message closest to expiry
-	// this function assumes that messages processed by providers already filters out expired messages
-	const sorted = messages.sort((a, b) => {
-		const endDateA = a.metadata?.endDate;
-		const endDateB = b.metadata?.endDate;
-		// if both message end dates are falsy or have the same date string, treat them as equal
-		if (endDateA === endDateB) {
-			return 0;
-		}
-		// if only message A has an end date, treat it as closer to expiry
-		if (endDateA && !endDateB) {
-			return -1;
-		}
-		// if only message B has an end date, treat it as closer to expiry
-		if (!endDateA && endDateB) {
-			return 1;
-		}
-		// otherwise, compare them
-		return new Date(endDateA) < new Date(endDateB) ? -1 : 1;
-	});
-	// always return the top sorted
-	return sorted[0];
+	setConflictHandlerInteral(input);
 }

package/src/inAppMessaging/providers/pinpoint/apis/syncMessages.ts

@@ -5,19 +5,20 @@ import { InAppMessagingAction } from '@aws-amplify/core/internals/utils';
 import { resolveEndpointId } from '@aws-amplify/core/internals/providers/pinpoint';
 import { defaultStorage } from '@aws-amplify/core';
 import {
-	resolveConfig,
-	resolveCredentials,
-	getInAppMessagingUserAgentString,
-	STORAGE_KEY_SUFFIX,
-	PINPOINT_KEY_PREFIX,
-	CATEGORY,
-	CHANNEL_TYPE,
-} from '../utils';
-import {
-	getInAppMessages,
 	GetInAppMessagesInput,
 	GetInAppMessagesOutput,
+	getInAppMessages,
 } from '@aws-amplify/core/internals/aws-clients/pinpoint';
+
+import {
+	CATEGORY,
+	CHANNEL_TYPE,
+	PINPOINT_KEY_PREFIX,
+	STORAGE_KEY_SUFFIX,
+	getInAppMessagingUserAgentString,
+	resolveConfig,
+	resolveCredentials,
+} from '../utils';
 import {
 	InAppMessagingValidationErrorCode,
 	assertServiceError,
@@ -80,6 +81,7 @@ async function fetchInAppMessages() {
 		);
 		const { InAppMessageCampaigns: messages } =
 			response.InAppMessagesResponse ?? {};
+
 		return messages;
 	} catch (error) {
 		assertServiceError(error);