@aws-amplify/notifications 2.0.22 → 2.0.23-unstable.701f219.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/eventListeners/eventListeners.js +4 -7
- package/dist/cjs/eventListeners/eventListeners.js.map +1 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/clearMessages.js +1 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/clearMessages.js.map +1 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/dispatchEvent.js +7 -7
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/dispatchEvent.js.map +1 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/identifyUser.js +3 -2
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/identifyUser.js.map +1 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/initializeInAppMessaging.js +2 -2
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/initializeInAppMessaging.js.map +1 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/onMessageDisplayed.js +1 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/onMessageDisplayed.js.map +1 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/setConflictHandler.js +3 -27
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/setConflictHandler.js.map +1 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/syncMessages.js +1 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/apis/syncMessages.js.map +1 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/utils/conflictHandlerManager.js +50 -0
- package/dist/cjs/inAppMessaging/providers/pinpoint/utils/conflictHandlerManager.js.map +1 -0
- package/dist/cjs/inAppMessaging/providers/pinpoint/utils/helpers.js +8 -8
- package/dist/cjs/inAppMessaging/providers/pinpoint/utils/helpers.js.map +1 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/utils/index.js +4 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/utils/index.js.map +1 -1
- package/dist/cjs/inAppMessaging/providers/pinpoint/utils/messageProcessingHelpers.js +5 -6
- package/dist/cjs/inAppMessaging/providers/pinpoint/utils/messageProcessingHelpers.js.map +1 -1
- package/dist/cjs/pushNotifications/providers/pinpoint/apis/initializePushNotifications.native.js +14 -5
- package/dist/cjs/pushNotifications/providers/pinpoint/apis/initializePushNotifications.native.js.map +1 -1
- package/dist/cjs/pushNotifications/providers/pinpoint/utils/getAnalyticsEvent.js +1 -1
- package/dist/cjs/pushNotifications/providers/pinpoint/utils/getAnalyticsEvent.js.map +1 -1
- package/dist/esm/eventListeners/eventListeners.d.ts +2 -2
- package/dist/esm/eventListeners/eventListeners.mjs +4 -7
- package/dist/esm/eventListeners/eventListeners.mjs.map +1 -1
- package/dist/esm/eventListeners/types.d.ts +6 -5
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/clearMessages.mjs +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/clearMessages.mjs.map +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/dispatchEvent.mjs +5 -4
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/dispatchEvent.mjs.map +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/identifyUser.d.ts +2 -2
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/identifyUser.mjs +3 -2
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/identifyUser.mjs.map +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/initializeInAppMessaging.mjs +2 -2
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/initializeInAppMessaging.mjs.map +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/onMessageDisplayed.d.ts +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/onMessageDisplayed.mjs +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/onMessageDisplayed.mjs.map +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/setConflictHandler.d.ts +1 -2
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/setConflictHandler.mjs +7 -27
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/setConflictHandler.mjs.map +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/syncMessages.mjs +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/apis/syncMessages.mjs.map +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/types/inputs.d.ts +3 -3
- package/dist/esm/inAppMessaging/providers/pinpoint/types/types.d.ts +4 -4
- package/dist/esm/inAppMessaging/providers/pinpoint/utils/conflictHandlerManager.d.ts +13 -0
- package/dist/esm/inAppMessaging/providers/pinpoint/utils/conflictHandlerManager.mjs +46 -0
- package/dist/esm/inAppMessaging/providers/pinpoint/utils/conflictHandlerManager.mjs.map +1 -0
- package/dist/esm/inAppMessaging/providers/pinpoint/utils/helpers.d.ts +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/utils/helpers.mjs +8 -8
- package/dist/esm/inAppMessaging/providers/pinpoint/utils/helpers.mjs.map +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/utils/index.d.ts +1 -0
- package/dist/esm/inAppMessaging/providers/pinpoint/utils/index.mjs +1 -0
- package/dist/esm/inAppMessaging/providers/pinpoint/utils/index.mjs.map +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/utils/messageProcessingHelpers.d.ts +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/utils/messageProcessingHelpers.mjs +5 -6
- package/dist/esm/inAppMessaging/providers/pinpoint/utils/messageProcessingHelpers.mjs.map +1 -1
- package/dist/esm/inAppMessaging/providers/pinpoint/utils/userAgent.mjs.map +1 -1
- package/dist/esm/inAppMessaging/types/event.d.ts +2 -2
- package/dist/esm/inAppMessaging/types/inputs.d.ts +2 -2
- package/dist/esm/pushNotifications/providers/pinpoint/apis/initializePushNotifications.native.mjs +14 -5
- package/dist/esm/pushNotifications/providers/pinpoint/apis/initializePushNotifications.native.mjs.map +1 -1
- package/dist/esm/pushNotifications/providers/pinpoint/types/analytics.d.ts +2 -2
- package/dist/esm/pushNotifications/providers/pinpoint/types/inputs.d.ts +1 -1
- package/dist/esm/pushNotifications/providers/pinpoint/utils/createMessageEventRecorder.d.ts +1 -1
- package/dist/esm/pushNotifications/providers/pinpoint/utils/getAnalyticsEvent.mjs +1 -1
- package/dist/esm/pushNotifications/providers/pinpoint/utils/getAnalyticsEvent.mjs.map +1 -1
- package/dist/esm/pushNotifications/providers/pinpoint/utils/resolveConfig.mjs.map +1 -1
- package/dist/esm/pushNotifications/types/inputs.d.ts +2 -2
- package/dist/esm/pushNotifications/utils/resolveCredentials.mjs.map +1 -1
- package/package.json +104 -103
- package/src/eventListeners/eventListeners.ts +16 -9
- package/src/eventListeners/types.ts +7 -5
- package/src/inAppMessaging/errors/assertServiceError.ts +1 -0
- package/src/inAppMessaging/providers/pinpoint/apis/clearMessages.ts +3 -2
- package/src/inAppMessaging/providers/pinpoint/apis/dispatchEvent.ts +18 -11
- package/src/inAppMessaging/providers/pinpoint/apis/identifyUser.ts +5 -7
- package/src/inAppMessaging/providers/pinpoint/apis/initializeInAppMessaging.ts +5 -3
- package/src/inAppMessaging/providers/pinpoint/apis/notifyMessageInteraction.ts +1 -0
- package/src/inAppMessaging/providers/pinpoint/apis/onMessageActionTaken.ts +2 -0
- package/src/inAppMessaging/providers/pinpoint/apis/onMessageDismissed.ts +2 -0
- package/src/inAppMessaging/providers/pinpoint/apis/onMessageDisplayed.ts +3 -1
- package/src/inAppMessaging/providers/pinpoint/apis/onMessageReceived.ts +2 -0
- package/src/inAppMessaging/providers/pinpoint/apis/setConflictHandler.ts +7 -34
- package/src/inAppMessaging/providers/pinpoint/apis/syncMessages.ts +12 -10
- package/src/inAppMessaging/providers/pinpoint/types/inputs.ts +8 -7
- package/src/inAppMessaging/providers/pinpoint/types/types.ts +4 -4
- package/src/inAppMessaging/providers/pinpoint/utils/conflictHandlerManager.ts +54 -0
- package/src/inAppMessaging/providers/pinpoint/utils/helpers.ts +19 -9
- package/src/inAppMessaging/providers/pinpoint/utils/index.ts +4 -0
- package/src/inAppMessaging/providers/pinpoint/utils/messageProcessingHelpers.ts +19 -11
- package/src/inAppMessaging/providers/pinpoint/utils/resolveConfig.ts +2 -0
- package/src/inAppMessaging/providers/pinpoint/utils/resolveCredentials.ts +2 -0
- package/src/inAppMessaging/providers/pinpoint/utils/userAgent.ts +2 -2
- package/src/inAppMessaging/types/event.ts +2 -2
- package/src/inAppMessaging/types/inputs.ts +4 -3
- package/src/pushNotifications/errors/errorHelpers.ts +2 -0
- package/src/pushNotifications/providers/pinpoint/apis/getBadgeCount.native.ts +2 -0
- package/src/pushNotifications/providers/pinpoint/apis/getBadgeCount.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/getLaunchNotification.native.ts +2 -0
- package/src/pushNotifications/providers/pinpoint/apis/getLaunchNotification.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/getPermissionStatus.native.ts +2 -0
- package/src/pushNotifications/providers/pinpoint/apis/getPermissionStatus.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/identifyUser.native.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/identifyUser.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/initializePushNotifications.native.ts +21 -12
- package/src/pushNotifications/providers/pinpoint/apis/initializePushNotifications.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/onNotificationOpened.native.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/onNotificationOpened.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/onNotificationReceivedInBackground.native.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/onNotificationReceivedInBackground.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/onNotificationReceivedInForeground.native.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/onNotificationReceivedInForeground.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/onTokenReceived.native.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/onTokenReceived.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/requestPermissions.native.ts +2 -0
- package/src/pushNotifications/providers/pinpoint/apis/requestPermissions.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/setBadgeCount.native.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/apis/setBadgeCount.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/types/analytics.ts +2 -2
- package/src/pushNotifications/providers/pinpoint/types/inputs.ts +4 -3
- package/src/pushNotifications/providers/pinpoint/utils/createMessageEventRecorder.ts +5 -1
- package/src/pushNotifications/providers/pinpoint/utils/getAnalyticsEvent.ts +3 -1
- package/src/pushNotifications/providers/pinpoint/utils/getChannelType.ts +1 -0
- package/src/pushNotifications/providers/pinpoint/utils/resolveConfig.ts +3 -1
- package/src/pushNotifications/types/inputs.ts +4 -3
- package/src/pushNotifications/utils/getPushNotificationUserAgentString.ts +1 -1
- package/src/pushNotifications/utils/resolveCredentials.ts +3 -1
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
4
|
import { loadAmplifyPushNotification } from '@aws-amplify/react-native';
|
|
5
|
+
|
|
5
6
|
import { assertIsInitialized } from '../../../errors/errorHelpers';
|
|
6
7
|
import { RequestPermissions } from '../types';
|
|
7
8
|
|
|
@@ -10,5 +11,6 @@ const { requestPermissions: requestPermissionsNative } =
|
|
|
10
11
|
|
|
11
12
|
export const requestPermissions: RequestPermissions = async input => {
|
|
12
13
|
assertIsInitialized();
|
|
14
|
+
|
|
13
15
|
return requestPermissionsNative(input);
|
|
14
16
|
};
|
|
@@ -8,7 +8,7 @@ export type PinpointMessageEvent =
|
|
|
8
8
|
|
|
9
9
|
export type PinpointMessageEventSource = '_campaign' | '_journey';
|
|
10
10
|
|
|
11
|
-
export
|
|
11
|
+
export interface AnalyticsEventAttributes {
|
|
12
12
|
source: PinpointMessageEventSource;
|
|
13
13
|
attributes: Record<string, string>;
|
|
14
|
-
}
|
|
14
|
+
}
|
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
|
-
import { IdentifyUserOptions } from './options';
|
|
5
4
|
import {
|
|
6
5
|
PushNotificationIdentifyUserInput,
|
|
7
|
-
PushNotificationRequestPermissionsInput,
|
|
8
|
-
PushNotificationSetBadgeCountInput,
|
|
9
6
|
PushNotificationOnNotificationOpenedInput,
|
|
10
7
|
PushNotificationOnNotificationReceivedInBackgroundInput,
|
|
11
8
|
PushNotificationOnNotificationReceivedInForegroundInput,
|
|
12
9
|
PushNotificationOnTokenReceivedInput,
|
|
10
|
+
PushNotificationRequestPermissionsInput,
|
|
11
|
+
PushNotificationSetBadgeCountInput,
|
|
13
12
|
} from '../../../types';
|
|
14
13
|
|
|
14
|
+
import { IdentifyUserOptions } from './options';
|
|
15
|
+
|
|
15
16
|
export type IdentifyUserInput =
|
|
16
17
|
PushNotificationIdentifyUserInput<IdentifyUserOptions>;
|
|
17
18
|
|
|
@@ -4,12 +4,14 @@
|
|
|
4
4
|
import { record } from '@aws-amplify/core/internals/providers/pinpoint';
|
|
5
5
|
import { ConsoleLogger } from '@aws-amplify/core';
|
|
6
6
|
import { AWSCredentials } from '@aws-amplify/core/internals/utils';
|
|
7
|
+
|
|
7
8
|
import { PinpointMessageEvent } from '../types';
|
|
8
9
|
import {
|
|
9
10
|
OnPushNotificationMessageHandler,
|
|
10
11
|
PushNotificationMessage,
|
|
11
12
|
} from '../../../types';
|
|
12
13
|
import { resolveCredentials } from '../../../utils';
|
|
14
|
+
|
|
13
15
|
import { getAnalyticsEvent } from './getAnalyticsEvent';
|
|
14
16
|
import { getChannelType } from './getChannelType';
|
|
15
17
|
import { resolveConfig } from './resolveConfig';
|
|
@@ -22,7 +24,7 @@ const logger = new ConsoleLogger('PushNotification.recordMessageEvent');
|
|
|
22
24
|
export const createMessageEventRecorder =
|
|
23
25
|
(
|
|
24
26
|
event: PinpointMessageEvent,
|
|
25
|
-
callback?:
|
|
27
|
+
callback?: () => void,
|
|
26
28
|
): OnPushNotificationMessageHandler =>
|
|
27
29
|
async message => {
|
|
28
30
|
const { credentials } = await resolveCredentials();
|
|
@@ -53,8 +55,10 @@ const recordMessageEvent = async ({
|
|
|
53
55
|
const analyticsEvent = getAnalyticsEvent(message, event);
|
|
54
56
|
if (!analyticsEvent) {
|
|
55
57
|
logger.debug('A notification missing event information was not recorded');
|
|
58
|
+
|
|
56
59
|
return;
|
|
57
60
|
}
|
|
61
|
+
|
|
58
62
|
return record({
|
|
59
63
|
appId,
|
|
60
64
|
category: 'PushNotification',
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
4
|
import { PinpointAnalyticsEvent } from '@aws-amplify/core/internals/providers/pinpoint';
|
|
5
|
+
|
|
5
6
|
import { AnalyticsEventAttributes, PinpointMessageEvent } from '../types';
|
|
6
7
|
import { PushNotificationMessage } from '../../../types';
|
|
7
8
|
|
|
@@ -25,6 +26,7 @@ export const getAnalyticsEvent = (
|
|
|
25
26
|
return null;
|
|
26
27
|
}
|
|
27
28
|
const { source, attributes } = eventAttributes;
|
|
29
|
+
|
|
28
30
|
return {
|
|
29
31
|
attributes,
|
|
30
32
|
name: `${source}.${event}`,
|
|
@@ -37,7 +39,7 @@ const getAnalyticsEventAttributes = (
|
|
|
37
39
|
if (!data) {
|
|
38
40
|
return;
|
|
39
41
|
}
|
|
40
|
-
if (
|
|
42
|
+
if (Object.prototype.hasOwnProperty.call(data, ANDROID_CAMPAIGN_ID_KEY)) {
|
|
41
43
|
return {
|
|
42
44
|
source: '_campaign',
|
|
43
45
|
attributes: {
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
4
|
import { Amplify } from '@aws-amplify/core';
|
|
5
|
-
|
|
5
|
+
|
|
6
|
+
import { PushNotificationValidationErrorCode, assert } from '../../../errors';
|
|
6
7
|
|
|
7
8
|
/**
|
|
8
9
|
* @internal
|
|
@@ -12,5 +13,6 @@ export const resolveConfig = () => {
|
|
|
12
13
|
Amplify.getConfig().Notifications?.PushNotification?.Pinpoint ?? {};
|
|
13
14
|
assert(!!appId, PushNotificationValidationErrorCode.NoAppId);
|
|
14
15
|
assert(!!region, PushNotificationValidationErrorCode.NoRegion);
|
|
16
|
+
|
|
15
17
|
return { appId, region };
|
|
16
18
|
};
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
4
|
import { UserProfile } from '@aws-amplify/core';
|
|
5
|
+
|
|
5
6
|
import { PushNotificationServiceOptions } from './options';
|
|
6
7
|
import { PushNotificationPermissions } from './module';
|
|
7
8
|
import {
|
|
@@ -9,10 +10,10 @@ import {
|
|
|
9
10
|
OnTokenReceivedHandler,
|
|
10
11
|
} from './pushNotifications';
|
|
11
12
|
|
|
12
|
-
export
|
|
13
|
+
export interface PushNotificationIdentifyUserInput<
|
|
13
14
|
ServiceOptions extends
|
|
14
15
|
PushNotificationServiceOptions = PushNotificationServiceOptions,
|
|
15
|
-
>
|
|
16
|
+
> {
|
|
16
17
|
/**
|
|
17
18
|
* A User ID associated to the current device.
|
|
18
19
|
*/
|
|
@@ -27,7 +28,7 @@ export type PushNotificationIdentifyUserInput<
|
|
|
27
28
|
* Options to be passed to the API.
|
|
28
29
|
*/
|
|
29
30
|
options?: ServiceOptions;
|
|
30
|
-
}
|
|
31
|
+
}
|
|
31
32
|
|
|
32
33
|
export type PushNotificationRequestPermissionsInput =
|
|
33
34
|
PushNotificationPermissions;
|
|
@@ -2,9 +2,10 @@
|
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
4
|
import { fetchAuthSession } from '@aws-amplify/core';
|
|
5
|
+
|
|
5
6
|
import {
|
|
6
|
-
assert,
|
|
7
7
|
PushNotificationValidationErrorCode,
|
|
8
|
+
assert,
|
|
8
9
|
} from '../errors/errorHelpers';
|
|
9
10
|
|
|
10
11
|
/**
|
|
@@ -13,5 +14,6 @@ import {
|
|
|
13
14
|
export const resolveCredentials = async () => {
|
|
14
15
|
const { credentials, identityId } = await fetchAuthSession();
|
|
15
16
|
assert(!!credentials, PushNotificationValidationErrorCode.NoCredentials);
|
|
17
|
+
|
|
16
18
|
return { credentials, identityId };
|
|
17
19
|
};
|