@aws-amplify/notifications 2.0.1-api-v6-models.9351bcf.0 → 2.0.1-api-v6-models.891fe0d.0

package/src/inAppMessaging/providers/pinpoint/utils/helpers.ts

@@ -22,9 +22,9 @@ import { getInAppMessagingUserAgentString } from './userAgent';
 
 const DELIVERY_TYPE = 'IN_APP_MESSAGE';
 
-let eventNameMemo = {};
-let eventAttributesMemo = {};
-let eventMetricsMemo = {};
+let eventNameMemo: Record<string, boolean> = {};
+let eventAttributesMemo: Record<string, boolean> = {};
+let eventMetricsMemo: Record<string, boolean> = {};
 
 export const logger = new ConsoleLogger('InAppMessaging.Pinpoint.Utils');
 
@@ -44,7 +44,8 @@ export const recordAnalyticsEvent = (
 				event: {
 					name: event,
 					attributes: {
-						campaign_id: id,
+						// only include campaign_id field if we have one
+						...(id && { campaign_id: id }),
 						delivery_type: DELIVERY_TYPE,
 						treatment_id: metadata?.treatmentId,
 					},
@@ -52,7 +53,7 @@ export const recordAnalyticsEvent = (
 				identityId,
 				region,
 				userAgentValue: getInAppMessagingUserAgentString(
-					InAppMessagingAction.DispatchEvent
+					InAppMessagingAction.NotifyMessageInteraction
 				),
 			});
 		})
@@ -72,19 +73,19 @@ export const matchesEventType = (
 	{ CampaignId, Schedule }: PinpointInAppMessage,
 	{ name: eventType }: InAppMessagingEvent
 ) => {
-	const { EventType } = Schedule?.EventFilter?.Dimensions;
+	const { EventType } = Schedule?.EventFilter?.Dimensions ?? {};
 	const memoKey = `${CampaignId}:${eventType}`;
 	if (!eventNameMemo.hasOwnProperty(memoKey)) {
-		eventNameMemo[memoKey] = !!EventType?.Values.includes(eventType);
+		eventNameMemo[memoKey] = !!EventType?.Values?.includes(eventType);
 	}
 	return eventNameMemo[memoKey];
 };
 
 export const matchesAttributes = (
 	{ CampaignId, Schedule }: PinpointInAppMessage,
-	{ attributes }: InAppMessagingEvent
+	{ attributes = {} }: InAppMessagingEvent
 ): boolean => {
-	const { Attributes } = Schedule?.EventFilter?.Dimensions;
+	const { Attributes } = Schedule?.EventFilter?.Dimensions ?? {};
 	if (isEmpty(Attributes)) {
 		// if message does not have attributes defined it does not matter what attributes are on the event
 		return true;
@@ -95,18 +96,20 @@ export const matchesAttributes = (
 	}
 	const memoKey = `${CampaignId}:${JSON.stringify(attributes)}`;
 	if (!eventAttributesMemo.hasOwnProperty(memoKey)) {
-		eventAttributesMemo[memoKey] = Object.entries(Attributes).every(
-			([key, { Values }]) => Values.includes(attributes[key])
-		);
+		eventAttributesMemo[memoKey] =
+			!Attributes ||
+			Object.entries(Attributes).every(([key, { Values }]) =>
+				Values?.includes(attributes[key])
+			);
 	}
 	return eventAttributesMemo[memoKey];
 };
 
 export const matchesMetrics = (
 	{ CampaignId, Schedule }: PinpointInAppMessage,
-	{ metrics }: InAppMessagingEvent
+	{ metrics = {} }: InAppMessagingEvent
 ): boolean => {
-	const { Metrics } = Schedule?.EventFilter?.Dimensions;
+	const { Metrics } = Schedule?.EventFilter?.Dimensions ?? {};
 	if (isEmpty(Metrics)) {
 		// if message does not have metrics defined it does not matter what metrics are on the event
 		return true;
@@ -117,18 +120,20 @@ export const matchesMetrics = (
 	}
 	const memoKey = `${CampaignId}:${JSON.stringify(metrics)}`;
 	if (!eventMetricsMemo.hasOwnProperty(memoKey)) {
-		eventMetricsMemo[memoKey] = Object.entries(Metrics).every(
-			([key, { ComparisonOperator, Value }]) => {
+		eventMetricsMemo[memoKey] =
+			!Metrics ||
+			Object.entries(Metrics).every(([key, { ComparisonOperator, Value }]) => {
 				const compare = getComparator(ComparisonOperator);
 				// if there is some unknown comparison operator, treat as a comparison failure
-				return compare ? compare(Value, metrics[key]) : false;
-			}
-		);
+				return compare && !!Value ? compare(Value, metrics[key]) : false;
+			});
 	}
 	return eventMetricsMemo[memoKey];
 };
 
-export const getComparator = (operator: string): MetricsComparator => {
+export const getComparator = (
+	operator?: string
+): MetricsComparator | undefined => {
 	switch (operator) {
 		case 'EQUAL':
 			return (metricsVal, eventVal) => metricsVal === eventVal;
@@ -141,7 +146,7 @@ export const getComparator = (operator: string): MetricsComparator => {
 		case 'LESS_THAN_OR_EQUAL':
 			return (metricsVal, eventVal) => metricsVal >= eventVal;
 		default:
-			return null;
+			return undefined;
 	}
 };
 
@@ -218,8 +223,9 @@ export const clearMemo = () => {
 // - 1. the usage of MOBILE_FEED and OVERLAYS as values for message layouts are not leaked
 //      outside the Pinpoint provider
 // - 2. Amplify correctly handles the legacy layout values from Pinpoint after they are updated
+
 export const interpretLayout = (
-	layout: PinpointInAppMessage['InAppMessage']['Layout']
+	layout: NonNullable<PinpointInAppMessage['InAppMessage']>['Layout']
 ): InAppMessageLayout => {
 	if (layout === 'MOBILE_FEED') {
 		return 'MODAL';
@@ -258,21 +264,23 @@ export const extractContent = ({
 			}
 			if (HeaderConfig) {
 				extractedContent.header = {
-					content: HeaderConfig.Header,
+					// Default to empty string in rare cases we don't have a Header value
+					content: HeaderConfig.Header ?? '',
 					style: {
 						color: HeaderConfig.TextColor,
 						textAlign:
-							HeaderConfig.Alignment.toLowerCase() as InAppMessageTextAlign,
+							HeaderConfig.Alignment?.toLowerCase() as InAppMessageTextAlign,
 					},
 				};
 			}
 			if (BodyConfig) {
 				extractedContent.body = {
-					content: BodyConfig.Body,
+					// Default to empty string in rare cases we don't have a Body value
+					content: BodyConfig.Body ?? '',
 					style: {
 						color: BodyConfig.TextColor,
 						textAlign:
-							BodyConfig.Alignment.toLowerCase() as InAppMessageTextAlign,
+							BodyConfig.Alignment?.toLowerCase() as InAppMessageTextAlign,
 					},
 				};
 			}
@@ -283,7 +291,8 @@ export const extractContent = ({
 			}
 			if (defaultPrimaryButton) {
 				extractedContent.primaryButton = {
-					title: defaultPrimaryButton.Text,
+					// Default to empty string in rare cases we don't have a Text value
+					title: defaultPrimaryButton.Text ?? '',
 					action: defaultPrimaryButton.ButtonAction as InAppMessageAction,
 					url: defaultPrimaryButton.Link,
 					style: {
@@ -295,7 +304,8 @@ export const extractContent = ({
 			}
 			if (defaultSecondaryButton) {
 				extractedContent.secondaryButton = {
-					title: defaultSecondaryButton.Text,
+					// Default to empty string in rare cases we don't have a Text value
+					title: defaultSecondaryButton.Text ?? '',
 					action: defaultSecondaryButton.ButtonAction as InAppMessageAction,
 					url: defaultSecondaryButton.Link,
 					style: {

package/src/inAppMessaging/providers/pinpoint/utils/messageProcessingHelpers.ts

@@ -30,7 +30,7 @@ export async function processInAppMessages(
 	messages: PinpointInAppMessage[],
 	event: InAppMessagingEvent
 ): Promise<InAppMessage[]> {
-	let highestPrioritySeen: number;
+	let highestPrioritySeen: number | undefined;
 	let acc: PinpointInAppMessage[] = [];
 	for (let index = 0; index < messages.length; index++) {
 		const message = messages[index];
@@ -88,9 +88,13 @@ function normalizeMessages(messages: PinpointInAppMessage[]): InAppMessage[] {
 	return messages.map(message => {
 		const { CampaignId, InAppMessage } = message;
 		return {
-			id: CampaignId,
+			// Default to empty string in rare cases we don't have a campaignId
+			id: CampaignId ?? '',
 			content: extractContent(message),
-			layout: interpretLayout(InAppMessage.Layout),
+			// Default to TOP_BANNER layout in rare cases we don't have a Layout
+			layout: InAppMessage?.Layout
+				? interpretLayout(InAppMessage.Layout)
+				: 'TOP_BANNER',
 			metadata: extractMetadata(message),
 		};
 	});
@@ -114,16 +118,28 @@ async function isBelowCap({
 }
 
 async function getMessageCounts(
-	messageId: string
+	messageId?: string
 ): Promise<InAppMessageCounts> {
+	let messageCounts = {
+		sessionCount: 0,
+		dailyCount: 0,
+		totalCount: 0,
+	};
 	try {
-		return {
-			sessionCount: getSessionCount(messageId),
-			dailyCount: await getDailyCount(),
-			totalCount: await getTotalCount(messageId),
-		};
+		// only return true counts if there is a messageId else default to 0
+		if (messageId)
+			messageCounts = {
+				sessionCount: getSessionCount(messageId),
+				dailyCount: await getDailyCount(),
+				totalCount: await getTotalCount(messageId),
+			};
+		return messageCounts;
 	} catch (err) {
 		logger.error('Failed to get message counts from storage', err);
+
+		// If there are no cached counts or there is an error,
+		// we default to 0 allowing all the messages to be eligible
+		return messageCounts;
 	}
 }
 

package/src/inAppMessaging/providers/pinpoint/utils/resolveConfig.ts

@@ -12,7 +12,7 @@ import {
  */
 export const resolveConfig = () => {
 	const { appId, region } =
-		Amplify.getConfig().Notifications?.InAppMessaging.Pinpoint ?? {};
+		Amplify.getConfig().Notifications?.InAppMessaging?.Pinpoint ?? {};
 	assertValidationError(!!appId, InAppMessagingValidationErrorCode.NoAppId);
 	assertValidationError(!!region, InAppMessagingValidationErrorCode.NoRegion);
 	return { appId, region };

package/src/pushNotifications/index.ts

@@ -3,6 +3,7 @@
 
 export {
 	getBadgeCount,
+	GetBadgeCountOutput,
 	getLaunchNotification,
 	GetLaunchNotificationOutput,
 	getPermissionStatus,

package/src/pushNotifications/providers/pinpoint/apis/getBadgeCount.ts

@@ -16,6 +16,6 @@ import { GetBadgeCount } from '../types';
  * const badgeCount = await getBadgeCount();
  * ```
  */
-export const getBadgeCount: GetBadgeCount = () => {
+export const getBadgeCount: GetBadgeCount = async () => {
 	throw new PlatformNotSupportedError();
 };

package/src/pushNotifications/providers/pinpoint/apis/getLaunchNotification.native.ts

@@ -8,7 +8,7 @@ import { GetLaunchNotification } from '../types';
 const { getLaunchNotification: getLaunchNotificationNative } =
 	loadAmplifyPushNotification();
 
-export const getLaunchNotification: GetLaunchNotification = () => {
+export const getLaunchNotification: GetLaunchNotification = async () => {
 	assertIsInitialized();
 	return getLaunchNotificationNative();
 };

package/src/pushNotifications/providers/pinpoint/apis/getLaunchNotification.ts

@@ -21,6 +21,6 @@ import { GetLaunchNotification, GetLaunchNotificationOutput } from '../types';
  * const launchNotification = await getLaunchNotification();
  * ```
  */
-export const getLaunchNotification: GetLaunchNotification = () => {
+export const getLaunchNotification: GetLaunchNotification = async () => {
 	throw new PlatformNotSupportedError();
 };

package/src/pushNotifications/providers/pinpoint/apis/getPermissionStatus.native.ts

@@ -8,7 +8,7 @@ import { GetPermissionStatus } from '../types';
 const { getPermissionStatus: getPermissionStatusNative } =
 	loadAmplifyPushNotification();
 
-export const getPermissionStatus: GetPermissionStatus = () => {
+export const getPermissionStatus: GetPermissionStatus = async () => {
 	assertIsInitialized();
 	return getPermissionStatusNative();
 };

package/src/pushNotifications/providers/pinpoint/apis/getPermissionStatus.ts

@@ -29,6 +29,6 @@ import { GetPermissionStatus, GetPermissionStatusOutput } from '../types';
  * ```ts
  * const permissionStatus = await getPermissionStatus();
  */
-export const getPermissionStatus: GetPermissionStatus = () => {
+export const getPermissionStatus: GetPermissionStatus = async () => {
 	throw new PlatformNotSupportedError();
 };

package/src/pushNotifications/providers/pinpoint/apis/identifyUser.native.ts

@@ -4,8 +4,11 @@
 import { PushNotificationAction } from '@aws-amplify/core/internals/utils';
 import { updateEndpoint } from '@aws-amplify/core/internals/providers/pinpoint';
 import { assertIsInitialized } from '../../../errors/errorHelpers';
-import { resolveConfig, resolveCredentials } from '../../../utils';
-import { getChannelType, getPushNotificationUserAgentString } from '../utils';
+import {
+	getPushNotificationUserAgentString,
+	resolveCredentials,
+} from '../../../utils';
+import { getChannelType, resolveConfig } from '../utils';
 import { IdentifyUser } from '../types';
 
 export const identifyUser: IdentifyUser = async ({

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

@@ -57,6 +57,6 @@ import { IdentifyUser, IdentifyUserInput } from '../types';
  *     },
  * });
  */
-export const identifyUser: IdentifyUser = () => {
+export const identifyUser: IdentifyUser = async () => {
 	throw new PlatformNotSupportedError();
 };

package/src/pushNotifications/providers/pinpoint/apis/initializePushNotifications.native.ts

@@ -12,17 +12,17 @@ import {
 	notifyEventListenersAndAwaitHandlers,
 } from '../../../../eventListeners';
 import {
+	getPushNotificationUserAgentString,
 	getToken,
 	initialize,
 	isInitialized,
-	resolveConfig,
 	resolveCredentials,
 	setToken,
 } from '../../../utils';
 import {
 	createMessageEventRecorder,
 	getChannelType,
-	getPushNotificationUserAgentString,
+	resolveConfig,
 } from '../utils';
 
 const {
@@ -37,7 +37,7 @@ const logger = new ConsoleLogger('Notifications.PushNotification');
 
 const BACKGROUND_TASK_TIMEOUT = 25; // seconds
 
-export const initializePushNotifications = (): Promise<void> => {
+export const initializePushNotifications = (): void => {
 	if (isInitialized()) {
 		logger.info('Push notifications have already been enabled');
 		return;
@@ -47,37 +47,10 @@ export const initializePushNotifications = (): Promise<void> => {
 	initialize();
 };
 
-const addAnalyticsListeners = (): void => {
-	let launchNotificationOpenedListenerRemover: EventListenerRemover;
-
-	// wire up default Pinpoint message event handling
-	addEventListener(
-		'backgroundMessageReceived',
-		createMessageEventRecorder('backgroundMessageReceived')
-	);
-	addEventListener(
-		'foregroundMessageReceived',
-		createMessageEventRecorder('foregroundMessageReceived')
-	);
-	launchNotificationOpenedListenerRemover = addEventListener(
-		'launchNotificationsOpened',
-		createMessageEventRecorder(
-			'notificationOpened',
-			// once we are done with it we can remove the listener
-			launchNotificationOpenedListenerRemover?.remove
-		)
-	);
-	addEventListener(
-		'notificationOpened',
-		createMessageEventRecorder(
-			'notificationOpened',
-			// if we are in this state, we no longer need the listener as the app was launched via some other means
-			launchNotificationOpenedListenerRemover?.remove
-		)
-	);
-};
-
 const addNativeListeners = (): void => {
+	let launchNotificationOpenedListener: ReturnType<
+		typeof addMessageEventListener
+	> | null;
 	const { NativeEvent, NativeHeadlessTaskKey } = getConstants();
 	const {
 		BACKGROUND_MESSAGE_RECEIVED,
@@ -126,7 +99,9 @@ const addNativeListeners = (): void => {
 					logger.error(err);
 				} finally {
 					// notify native module that handlers have completed their work (or timed out)
-					completeNotification(completionHandlerId);
+					if (completionHandlerId) {
+						completeNotification(completionHandlerId);
+					}
 				}
 			}
 		);
@@ -140,14 +115,14 @@ const addNativeListeners = (): void => {
 		}
 	);
 
-	const launchNotificationOpenedListener = LAUNCH_NOTIFICATION_OPENED
+	launchNotificationOpenedListener = LAUNCH_NOTIFICATION_OPENED
 		? addMessageEventListener(
 				// listen for native notification opened app (user tapped on notification, opening the app from quit -
 				// not background - state) event. This is broadcasted to an internal listener only as it is not intended
 				// for use otherwise as it produces inconsistent results when used within React Native app context
 				LAUNCH_NOTIFICATION_OPENED,
 				message => {
-					notifyEventListeners('launchNotificationsOpened', message);
+					notifyEventListeners('launchNotificationOpened', message);
 					// once we are done with it we can remove the listener
 					launchNotificationOpenedListener?.remove();
 				}
@@ -169,23 +144,58 @@ const addNativeListeners = (): void => {
 		// listen for native new token event, automatically re-register device with provider using new token and
 		// broadcast to library listeners
 		TOKEN_RECEIVED,
-		token => {
+		async token => {
 			// avoid a race condition where two endpoints are created with the same token on a fresh install
 			if (getToken() === token) {
 				return;
 			}
 			setToken(token);
-			registerDevice();
 			notifyEventListeners('tokenReceived', token);
+			try {
+				await registerDevice(token);
+			} catch (err) {
+				logger.error('Failed to register device for push notifications', err);
+				throw err;
+			}
 		}
 	);
 };
 
-const registerDevice = async (): Promise<void> => {
+const addAnalyticsListeners = (): void => {
+	let launchNotificationOpenedListenerRemover: EventListenerRemover | undefined;
+
+	// wire up default Pinpoint message event handling
+	addEventListener(
+		'backgroundMessageReceived',
+		createMessageEventRecorder('received_background')
+	);
+	addEventListener(
+		'foregroundMessageReceived',
+		createMessageEventRecorder('received_foreground')
+	);
+	launchNotificationOpenedListenerRemover = addEventListener(
+		'launchNotificationOpened',
+		createMessageEventRecorder(
+			'opened_notification',
+			// once we are done with it we can remove the listener
+			launchNotificationOpenedListenerRemover?.remove
+		)
+	);
+	addEventListener(
+		'notificationOpened',
+		createMessageEventRecorder(
+			'opened_notification',
+			// if we are in this state, we no longer need the listener as the app was launched via some other means
+			launchNotificationOpenedListenerRemover?.remove
+		)
+	);
+};
+
+const registerDevice = async (address: string): Promise<void> => {
 	const { credentials, identityId } = await resolveCredentials();
 	const { appId, region } = resolveConfig();
-	return updateEndpoint({
-		address: getToken(),
+	await updateEndpoint({
+		address,
 		appId,
 		category: 'PushNotification',
 		credentials,

package/src/pushNotifications/providers/pinpoint/apis/requestPermissions.native.ts

@@ -8,7 +8,7 @@ import { RequestPermissions } from '../types';
 const { requestPermissions: requestPermissionsNative } =
 	loadAmplifyPushNotification();
 
-export const requestPermissions: RequestPermissions = input => {
+export const requestPermissions: RequestPermissions = async input => {
 	assertIsInitialized();
 	return requestPermissionsNative(input);
 };

package/src/pushNotifications/providers/pinpoint/apis/requestPermissions.ts

@@ -34,6 +34,6 @@ import { RequestPermissions } from '../types';
  * });
  * ```
  */
-export const requestPermissions: RequestPermissions = () => {
+export const requestPermissions: RequestPermissions = async () => {
 	throw new PlatformNotSupportedError();
 };

package/src/pushNotifications/providers/pinpoint/index.ts

@@ -24,6 +24,7 @@ export {
 	SetBadgeCountInput,
 } from './types/inputs';
 export {
+	GetBadgeCountOutput,
 	GetLaunchNotificationOutput,
 	GetPermissionStatusOutput,
 	OnNotificationOpenedOutput,

package/src/pushNotifications/providers/pinpoint/utils/createMessageEventRecorder.ts

@@ -4,14 +4,15 @@
 import { record } from '@aws-amplify/core/internals/providers/pinpoint';
 import { ConsoleLogger } from '@aws-amplify/core';
 import { AWSCredentials } from '@aws-amplify/core/internals/utils';
+import { PinpointMessageEvent } from '../types';
 import {
 	OnPushNotificationMessageHandler,
-	PushNotificationEvent,
 	PushNotificationMessage,
 } from '../../../types';
+import { resolveCredentials } from '../../../utils';
 import { getAnalyticsEvent } from './getAnalyticsEvent';
 import { getChannelType } from './getChannelType';
-import { resolveConfig, resolveCredentials } from '../../../utils';
+import { resolveConfig } from './resolveConfig';
 
 const logger = new ConsoleLogger('PushNotification.recordMessageEvent');
 
@@ -20,7 +21,7 @@ const logger = new ConsoleLogger('PushNotification.recordMessageEvent');
  */
 export const createMessageEventRecorder =
 	(
-		event: PushNotificationEvent,
+		event: PinpointMessageEvent,
 		callback?: Function
 	): OnPushNotificationMessageHandler =>
 	async message => {
@@ -45,7 +46,7 @@ const recordMessageEvent = async ({
 }: {
 	appId: string;
 	credentials: AWSCredentials;
-	event: PushNotificationEvent;
+	event: PinpointMessageEvent;
 	message: PushNotificationMessage;
 	region: string;
 }): Promise<void> => {

package/src/pushNotifications/providers/pinpoint/utils/getAnalyticsEvent.ts

@@ -2,8 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { PinpointAnalyticsEvent } from '@aws-amplify/core/internals/providers/pinpoint';
-import { AnalyticsEventAttributes } from '../types';
-import { PushNotificationEvent, PushNotificationMessage } from '../../../types';
+import { AnalyticsEventAttributes, PinpointMessageEvent } from '../types';
+import { PushNotificationMessage } from '../../../types';
 
 const ANDROID_CAMPAIGN_ACTIVITY_ID_KEY =
 	'pinpoint.campaign.campaign_activity_id';
@@ -15,7 +15,7 @@ const ANDROID_CAMPAIGN_TREATMENT_ID_KEY = 'pinpoint.campaign.treatment_id';
  */
 export const getAnalyticsEvent = (
 	{ data }: PushNotificationMessage,
-	event: PushNotificationEvent
+	event: PinpointMessageEvent
 ): PinpointAnalyticsEvent | null => {
 	if (!data) {
 		return null;
@@ -33,7 +33,10 @@ export const getAnalyticsEvent = (
 
 const getAnalyticsEventAttributes = (
 	data: PushNotificationMessage['data']
-): AnalyticsEventAttributes => {
+): AnalyticsEventAttributes | undefined => {
+	if (!data) {
+		return;
+	}
 	if (data.hasOwnProperty(ANDROID_CAMPAIGN_ID_KEY)) {
 		return {
 			source: '_campaign',

package/src/pushNotifications/providers/pinpoint/utils/getChannelType.ts

@@ -19,7 +19,7 @@ export const getChannelType = (): ChannelType => {
 	}
 	if (isIos) {
 		// If building in debug mode, use the APNs sandbox
-		return global['__DEV__'] ? 'APNS_SANDBOX' : 'APNS';
+		return __DEV__ ? 'APNS_SANDBOX' : 'APNS';
 	}
 	throw new PlatformNotSupportedError();
 };

package/src/pushNotifications/providers/pinpoint/utils/index.ts

@@ -2,5 +2,6 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export { createMessageEventRecorder } from './createMessageEventRecorder';
+export { getAnalyticsEvent } from './getAnalyticsEvent';
 export { getChannelType } from './getChannelType';
-export { getPushNotificationUserAgentString } from './getPushNotificationUserAgentString';
+export { resolveConfig } from './resolveConfig';

package/src/pushNotifications/{utils → providers/pinpoint/utils}/resolveConfig.ts

@@ -2,14 +2,14 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { Amplify } from '@aws-amplify/core';
-import { assert, PushNotificationValidationErrorCode } from '../errors';
+import { assert, PushNotificationValidationErrorCode } from '../../../errors';
 
 /**
  * @internal
  */
 export const resolveConfig = () => {
 	const { appId, region } =
-		Amplify.getConfig().Notifications?.PushNotification.Pinpoint ?? {};
+		Amplify.getConfig().Notifications?.PushNotification?.Pinpoint ?? {};
 	assert(!!appId, PushNotificationValidationErrorCode.NoAppId);
 	assert(!!region, PushNotificationValidationErrorCode.NoRegion);
 	return { appId, region };

package/src/pushNotifications/types/index.ts

@@ -3,6 +3,7 @@
 
 export * from './errors';
 export * from './inputs';
+export * from './module';
 export * from './options';
 export * from './outputs';
 export * from './pushNotifications';

package/src/pushNotifications/types/inputs.ts

@@ -3,10 +3,10 @@
 
 import { UserProfile } from '@aws-amplify/core';
 import { PushNotificationServiceOptions } from './options';
+import { PushNotificationPermissions } from './module';
 import {
 	OnPushNotificationMessageHandler,
 	OnTokenReceivedHandler,
-	PushNotificationPermissions,
 } from './pushNotifications';
 
 export type PushNotificationIdentifyUserInput<