@aws-amplify/notifications 2.0.17 → 2.0.18-experimental-lerna-test.d2b0b08.55

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

@@ -5,6 +5,7 @@ import { ConsoleLogger } from '@aws-amplify/core';
 import { PushNotificationAction } from '@aws-amplify/core/internals/utils';
 import { updateEndpoint } from '@aws-amplify/core/internals/providers/pinpoint';
 import { loadAmplifyPushNotification } from '@aws-amplify/react-native';
+
 import {
 	EventListenerRemover,
 	addEventListener,
@@ -40,6 +41,7 @@ const BACKGROUND_TASK_TIMEOUT = 25; // seconds
 export const initializePushNotifications = (): void => {
 	if (isInitialized()) {
 		logger.info('Push notifications have already been enabled');
+
 		return;
 	}
 	addNativeListeners();
@@ -48,9 +50,9 @@ export const initializePushNotifications = (): void => {
 };
 
 const addNativeListeners = (): void => {
-	let launchNotificationOpenedListener: ReturnType<
-		typeof addMessageEventListener
-	> | null;
+	let launchNotificationOpenedListener:
+		| ReturnType<typeof addMessageEventListener>
+		| undefined;
 	const { NativeEvent, NativeHeadlessTaskKey } = getConstants();
 	const {
 		BACKGROUND_MESSAGE_RECEIVED,
@@ -85,14 +87,14 @@ const addNativeListeners = (): void => {
 						// background tasks will get suspended and all future tasks be deprioritized by the OS if they run for
 						// more than 30 seconds so we reject with a error in a shorter amount of time to prevent this from
 						// happening
-						new Promise((_, reject) => {
-							setTimeout(
-								() =>
-									reject(
+						new Promise((_resolve, reject) => {
+							setTimeout(() => {
+								reject(
+									new Error(
 										`onNotificationReceivedInBackground handlers should complete their work within ${BACKGROUND_TASK_TIMEOUT} seconds, but they did not.`,
 									),
-								BACKGROUND_TASK_TIMEOUT * 1000,
-							);
+								);
+							}, BACKGROUND_TASK_TIMEOUT * 1000);
 						}),
 					]);
 				} catch (err) {
@@ -125,9 +127,10 @@ const addNativeListeners = (): void => {
 					notifyEventListeners('launchNotificationOpened', message);
 					// once we are done with it we can remove the listener
 					launchNotificationOpenedListener?.remove();
+					launchNotificationOpenedListener = undefined;
 				},
 			)
-		: null;
+		: undefined;
 
 	addMessageEventListener(
 		// listen for native notification opened (user tapped on notification, opening the app from background -
@@ -178,7 +181,10 @@ const addAnalyticsListeners = (): void => {
 		createMessageEventRecorder(
 			'opened_notification',
 			// once we are done with it we can remove the listener
-			launchNotificationOpenedListenerRemover?.remove,
+			() => {
+				launchNotificationOpenedListenerRemover?.remove();
+				launchNotificationOpenedListenerRemover = undefined;
+			},
 		),
 	);
 	addEventListener(
@@ -186,7 +192,10 @@ const addAnalyticsListeners = (): void => {
 		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,
+			() => {
+				launchNotificationOpenedListenerRemover?.remove();
+				launchNotificationOpenedListenerRemover = undefined;
+			},
 		),
 	);
 };

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { PlatformNotSupportedError } from '@aws-amplify/core/internals/utils';
+
 import { InitializePushNotifications } from '../types';
 
 /**

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

@@ -7,5 +7,6 @@ import { OnNotificationOpened } from '../types';
 
 export const onNotificationOpened: OnNotificationOpened = input => {
 	assertIsInitialized();
+
 	return addEventListener('notificationOpened', input);
 };

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { PlatformNotSupportedError } from '@aws-amplify/core/internals/utils';
+
 import { PushNotificationMessage } from '../../../types';
 import {
 	OnNotificationOpened,

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

@@ -8,5 +8,6 @@ import { OnNotificationReceivedInBackground } from '../types';
 export const onNotificationReceivedInBackground: OnNotificationReceivedInBackground =
 	input => {
 		assertIsInitialized();
+
 		return addEventListener('backgroundMessageReceived', input);
 	};

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { PlatformNotSupportedError } from '@aws-amplify/core/internals/utils';
+
 import { PushNotificationMessage } from '../../../types';
 import {
 	OnNotificationReceivedInBackground,

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

@@ -8,5 +8,6 @@ import { OnNotificationReceivedInForeground } from '../types';
 export const onNotificationReceivedInForeground: OnNotificationReceivedInForeground =
 	input => {
 		assertIsInitialized();
+
 		return addEventListener('foregroundMessageReceived', input);
 	};

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { PlatformNotSupportedError } from '@aws-amplify/core/internals/utils';
+
 import { PushNotificationMessage } from '../../../types';
 import {
 	OnNotificationReceivedInForeground,

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

@@ -7,5 +7,6 @@ import { OnTokenReceived } from '../types';
 
 export const onTokenReceived: OnTokenReceived = input => {
 	assertIsInitialized();
+
 	return addEventListener('tokenReceived', input);
 };

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { PlatformNotSupportedError } from '@aws-amplify/core/internals/utils';
+
 import {
 	OnTokenReceived,
 	OnTokenReceivedInput,

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { loadAmplifyPushNotification } from '@aws-amplify/react-native';
+
 import { assertIsInitialized } from '../../../errors/errorHelpers';
 import { RequestPermissions } from '../types';
 
@@ -10,5 +11,6 @@ const { requestPermissions: requestPermissionsNative } =
 
 export const requestPermissions: RequestPermissions = async input => {
 	assertIsInitialized();
+
 	return requestPermissionsNative(input);
 };

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { PlatformNotSupportedError } from '@aws-amplify/core/internals/utils';
+
 import { RequestPermissions } from '../types';
 
 /**

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { loadAmplifyPushNotification } from '@aws-amplify/react-native';
+
 import { assertIsInitialized } from '../../../errors/errorHelpers';
 import { SetBadgeCount } from '../types';
 

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { PlatformNotSupportedError } from '@aws-amplify/core/internals/utils';
+
 import { SetBadgeCount } from '../types';
 
 /**

package/src/pushNotifications/providers/pinpoint/types/analytics.ts

@@ -8,7 +8,7 @@ export type PinpointMessageEvent =
 
 export type PinpointMessageEventSource = '_campaign' | '_journey';
 
-export type AnalyticsEventAttributes = {
+export interface AnalyticsEventAttributes {
 	source: PinpointMessageEventSource;
 	attributes: Record<string, string>;
-};
+}

package/src/pushNotifications/providers/pinpoint/types/inputs.ts

@@ -1,17 +1,18 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-import { IdentifyUserOptions } from './options';
 import {
 	PushNotificationIdentifyUserInput,
-	PushNotificationRequestPermissionsInput,
-	PushNotificationSetBadgeCountInput,
 	PushNotificationOnNotificationOpenedInput,
 	PushNotificationOnNotificationReceivedInBackgroundInput,
 	PushNotificationOnNotificationReceivedInForegroundInput,
 	PushNotificationOnTokenReceivedInput,
+	PushNotificationRequestPermissionsInput,
+	PushNotificationSetBadgeCountInput,
 } from '../../../types';
 
+import { IdentifyUserOptions } from './options';
+
 export type IdentifyUserInput =
 	PushNotificationIdentifyUserInput<IdentifyUserOptions>;
 

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

@@ -4,12 +4,14 @@
 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,
 	PushNotificationMessage,
 } from '../../../types';
 import { resolveCredentials } from '../../../utils';
+
 import { getAnalyticsEvent } from './getAnalyticsEvent';
 import { getChannelType } from './getChannelType';
 import { resolveConfig } from './resolveConfig';
@@ -22,7 +24,7 @@ const logger = new ConsoleLogger('PushNotification.recordMessageEvent');
 export const createMessageEventRecorder =
 	(
 		event: PinpointMessageEvent,
-		callback?: Function,
+		callback?: () => void,
 	): OnPushNotificationMessageHandler =>
 	async message => {
 		const { credentials } = await resolveCredentials();
@@ -53,8 +55,10 @@ const recordMessageEvent = async ({
 	const analyticsEvent = getAnalyticsEvent(message, event);
 	if (!analyticsEvent) {
 		logger.debug('A notification missing event information was not recorded');
+
 		return;
 	}
+
 	return record({
 		appId,
 		category: 'PushNotification',

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

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { PinpointAnalyticsEvent } from '@aws-amplify/core/internals/providers/pinpoint';
+
 import { AnalyticsEventAttributes, PinpointMessageEvent } from '../types';
 import { PushNotificationMessage } from '../../../types';
 
@@ -25,6 +26,7 @@ export const getAnalyticsEvent = (
 		return null;
 	}
 	const { source, attributes } = eventAttributes;
+
 	return {
 		attributes,
 		name: `${source}.${event}`,
@@ -37,7 +39,7 @@ const getAnalyticsEventAttributes = (
 	if (!data) {
 		return;
 	}
-	if (data.hasOwnProperty(ANDROID_CAMPAIGN_ID_KEY)) {
+	if (Object.prototype.hasOwnProperty.call(data, ANDROID_CAMPAIGN_ID_KEY)) {
 		return {
 			source: '_campaign',
 			attributes: {

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

@@ -3,6 +3,7 @@
 
 import { PlatformNotSupportedError } from '@aws-amplify/core/internals/utils';
 import { getOperatingSystem } from '@aws-amplify/react-native';
+
 import { ChannelType } from '../types';
 
 const operatingSystem = getOperatingSystem();

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

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

package/src/pushNotifications/types/inputs.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { UserProfile } from '@aws-amplify/core';
+
 import { PushNotificationServiceOptions } from './options';
 import { PushNotificationPermissions } from './module';
 import {
@@ -9,10 +10,10 @@ import {
 	OnTokenReceivedHandler,
 } from './pushNotifications';
 
-export type PushNotificationIdentifyUserInput<
+export interface PushNotificationIdentifyUserInput<
 	ServiceOptions extends
 		PushNotificationServiceOptions = PushNotificationServiceOptions,
-> = {
+> {
 	/**
 	 * A User ID associated to the current device.
 	 */
@@ -27,7 +28,7 @@ export type PushNotificationIdentifyUserInput<
 	 * Options to be passed to the API.
 	 */
 	options?: ServiceOptions;
-};
+}
 
 export type PushNotificationRequestPermissionsInput =
 	PushNotificationPermissions;

package/src/pushNotifications/utils/getPushNotificationUserAgentString.ts

@@ -1,8 +1,8 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 import {
-	PushNotificationAction,
 	Category,
+	PushNotificationAction,
 	getAmplifyUserAgent,
 } from '@aws-amplify/core/internals/utils';
 

package/src/pushNotifications/utils/resolveCredentials.ts

@@ -2,9 +2,10 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { fetchAuthSession } from '@aws-amplify/core';
+
 import {
-	assert,
 	PushNotificationValidationErrorCode,
+	assert,
 } from '../errors/errorHelpers';
 
 /**
@@ -13,5 +14,6 @@ import {
 export const resolveCredentials = async () => {
 	const { credentials, identityId } = await fetchAuthSession();
 	assert(!!credentials, PushNotificationValidationErrorCode.NoCredentials);
+
 	return { credentials, identityId };
 };