@aws-amplify/notifications 1.1.8-unstable.ffe65ea.1 → 1.2.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/lib/InAppMessaging/Providers/AWSPinpointProvider/index.d.ts +2 -1
- package/lib/InAppMessaging/Providers/AWSPinpointProvider/index.js +5 -6
- package/lib/InAppMessaging/Providers/AWSPinpointProvider/index.js.map +1 -1
- package/lib/InAppMessaging/Providers/AWSPinpointProvider/utils.d.ts +1 -1
- package/lib/InAppMessaging/Providers/AWSPinpointProvider/utils.js +2 -3
- package/lib/InAppMessaging/Providers/AWSPinpointProvider/utils.js.map +1 -1
- package/lib/PushNotification/Providers/AWSPinpointProvider/index.js +2 -3
- package/lib/PushNotification/Providers/AWSPinpointProvider/index.js.map +1 -1
- package/lib/PushNotification/Providers/AWSPinpointProvider/utils.d.ts +1 -1
- package/lib/common/AWSPinpointProviderCommon/index.d.ts +2 -2
- package/lib/common/AWSPinpointProviderCommon/index.js +44 -61
- package/lib/common/AWSPinpointProviderCommon/index.js.map +1 -1
- package/lib/common/AWSPinpointProviderCommon/types.d.ts +1 -0
- package/lib-esm/InAppMessaging/Providers/AWSPinpointProvider/index.d.ts +2 -1
- package/lib-esm/InAppMessaging/Providers/AWSPinpointProvider/index.js +5 -6
- package/lib-esm/InAppMessaging/Providers/AWSPinpointProvider/index.js.map +1 -1
- package/lib-esm/InAppMessaging/Providers/AWSPinpointProvider/utils.d.ts +1 -1
- package/lib-esm/InAppMessaging/Providers/AWSPinpointProvider/utils.js +2 -3
- package/lib-esm/InAppMessaging/Providers/AWSPinpointProvider/utils.js.map +1 -1
- package/lib-esm/PushNotification/Providers/AWSPinpointProvider/index.js +2 -3
- package/lib-esm/PushNotification/Providers/AWSPinpointProvider/index.js.map +1 -1
- package/lib-esm/PushNotification/Providers/AWSPinpointProvider/utils.d.ts +1 -1
- package/lib-esm/common/AWSPinpointProviderCommon/index.d.ts +2 -2
- package/lib-esm/common/AWSPinpointProviderCommon/index.js +45 -62
- package/lib-esm/common/AWSPinpointProviderCommon/index.js.map +1 -1
- package/lib-esm/common/AWSPinpointProviderCommon/types.d.ts +1 -0
- package/package.json +7 -8
- package/src/InAppMessaging/Providers/AWSPinpointProvider/index.ts +11 -10
- package/src/InAppMessaging/Providers/AWSPinpointProvider/utils.ts +3 -6
- package/src/PushNotification/Providers/AWSPinpointProvider/index.ts +3 -3
- package/src/PushNotification/Providers/AWSPinpointProvider/utils.ts +1 -1
- package/src/common/AWSPinpointProviderCommon/index.ts +32 -64
- package/src/common/AWSPinpointProviderCommon/types.ts +15 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/InAppMessaging/Providers/AWSPinpointProvider/utils.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;;AAEtC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../src/InAppMessaging/Providers/AWSPinpointProvider/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
import { __assign, __awaiter, __extends, __generator } from "tslib";
|
|
4
|
-
import { ChannelType } from '@aws-sdk/client-pinpoint';
|
|
5
4
|
import { addEventListener, AWSPinpointProviderCommon } from '../../../common';
|
|
6
5
|
import PlatformNotSupportedError from '../../PlatformNotSupportedError';
|
|
7
6
|
import { Platform } from '../../Platform';
|
|
@@ -68,11 +67,11 @@ var AWSPinpointProvider = /** @class */ (function (_super) {
|
|
|
68
67
|
switch (Platform.OS) {
|
|
69
68
|
case 'android': {
|
|
70
69
|
// FCM was previously known as GCM and continues to be the channel type in Pinpoint
|
|
71
|
-
return
|
|
70
|
+
return 'GCM';
|
|
72
71
|
}
|
|
73
72
|
case 'ios': {
|
|
74
73
|
// If building in debug mode, use the APNs sandbox
|
|
75
|
-
return global['__DEV__'] ?
|
|
74
|
+
return global['__DEV__'] ? 'APNS_SANDBOX' : 'APNS';
|
|
76
75
|
}
|
|
77
76
|
default: {
|
|
78
77
|
throw new PlatformNotSupportedError();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/PushNotification/Providers/AWSPinpointProvider/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;;AAEtC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/PushNotification/Providers/AWSPinpointProvider/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Event as AWSPinpointAnalyticsEvent } from '@aws-
|
|
1
|
+
import type { Event as AWSPinpointAnalyticsEvent } from '@aws-amplify/core/internals/aws-clients/pinpoint';
|
|
2
2
|
import { ConsoleLogger } from '@aws-amplify/core';
|
|
3
3
|
import { PushNotificationMessage } from '../../types';
|
|
4
4
|
import { AWSPinpointMessageEvent } from './types';
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ConsoleLogger } from '@aws-amplify/core';
|
|
2
|
-
import { Event as AWSPinpointAnalyticsEvent } from '@aws-
|
|
2
|
+
import { Event as AWSPinpointAnalyticsEvent } from '@aws-amplify/core/internals/aws-clients/pinpoint';
|
|
3
3
|
import { NotificationsCategory, NotificationsSubCategory, NotificationsProvider, UserInfo } from '../../types';
|
|
4
4
|
import { AWSPinpointUserInfo } from './types';
|
|
5
5
|
export default abstract class AWSPinpointProviderCommon implements NotificationsProvider {
|
|
@@ -28,7 +28,7 @@ export default abstract class AWSPinpointProviderCommon implements Notifications
|
|
|
28
28
|
protected init: () => Promise<void>;
|
|
29
29
|
protected recordAnalyticsEvent: (event: AWSPinpointAnalyticsEvent) => Promise<void>;
|
|
30
30
|
protected updateEndpoint: (userId?: string, userInfo?: AWSPinpointUserInfo) => Promise<void>;
|
|
31
|
-
private initPinpointClient;
|
|
32
31
|
private getEndpointId;
|
|
33
32
|
private getCredentials;
|
|
33
|
+
private assertNotEmptyConfiguration;
|
|
34
34
|
}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
import { __assign, __awaiter, __generator } from "tslib";
|
|
4
|
-
import { ClientDevice, Credentials,
|
|
4
|
+
import { ClientDevice, Credentials, StorageHelper, transferKeyToUpperCase, } from '@aws-amplify/core';
|
|
5
5
|
import { Cache } from '@aws-amplify/cache';
|
|
6
|
-
import {
|
|
6
|
+
import { putEvents, updateEndpoint, } from '@aws-amplify/core/internals/aws-clients/pinpoint';
|
|
7
7
|
import { v4 as uuid } from 'uuid';
|
|
8
8
|
var AWSPinpointProviderCommon = /** @class */ (function () {
|
|
9
9
|
function AWSPinpointProviderCommon(logger) {
|
|
@@ -70,52 +70,46 @@ var AWSPinpointProviderCommon = /** @class */ (function () {
|
|
|
70
70
|
});
|
|
71
71
|
}); };
|
|
72
72
|
this.recordAnalyticsEvent = function (event) { return __awaiter(_this, void 0, void 0, function () {
|
|
73
|
-
var _a, appId, credentials, endpointId,
|
|
74
|
-
var
|
|
75
|
-
return __generator(this, function (
|
|
76
|
-
switch (
|
|
73
|
+
var _a, _b, appId, credentials, endpointId, region, input, err_3;
|
|
74
|
+
var _c, _d;
|
|
75
|
+
return __generator(this, function (_e) {
|
|
76
|
+
switch (_e.label) {
|
|
77
77
|
case 0:
|
|
78
|
-
|
|
78
|
+
// Update credentials
|
|
79
|
+
_a = this.config;
|
|
79
80
|
return [4 /*yield*/, this.getCredentials()];
|
|
80
81
|
case 1:
|
|
81
|
-
currentCredentials = _d.sent();
|
|
82
|
-
credentialsUpdated = !credentials ||
|
|
83
|
-
Object.keys(currentCredentials).some(function (key) { return currentCredentials[key] !== credentials[key]; });
|
|
84
82
|
// Update credentials
|
|
85
|
-
|
|
86
|
-
|
|
83
|
+
_a.credentials = _e.sent();
|
|
84
|
+
// Assert required configuration properties to make `putEvents` request are present
|
|
85
|
+
this.assertNotEmptyConfiguration();
|
|
86
|
+
_b = this.config, appId = _b.appId, credentials = _b.credentials, endpointId = _b.endpointId, region = _b.region;
|
|
87
|
+
_e.label = 2;
|
|
87
88
|
case 2:
|
|
88
|
-
|
|
89
|
-
if (!(!pinpointClient || credentialsUpdated)) return [3 /*break*/, 4];
|
|
90
|
-
return [4 /*yield*/, this.initPinpointClient()];
|
|
91
|
-
case 3:
|
|
92
|
-
_d.sent();
|
|
93
|
-
_d.label = 4;
|
|
94
|
-
case 4:
|
|
89
|
+
_e.trys.push([2, 4, , 5]);
|
|
95
90
|
input = {
|
|
96
91
|
ApplicationId: appId,
|
|
97
92
|
EventsRequest: {
|
|
98
|
-
BatchItem: (
|
|
99
|
-
|
|
93
|
+
BatchItem: (_c = {},
|
|
94
|
+
_c[endpointId] = {
|
|
100
95
|
Endpoint: {},
|
|
101
|
-
Events: (
|
|
102
|
-
|
|
103
|
-
|
|
96
|
+
Events: (_d = {},
|
|
97
|
+
_d[uuid()] = event,
|
|
98
|
+
_d),
|
|
104
99
|
},
|
|
105
|
-
|
|
100
|
+
_c),
|
|
106
101
|
},
|
|
107
102
|
};
|
|
108
|
-
command = new PutEventsCommand(input);
|
|
109
103
|
this.logger.debug('recording analytics event');
|
|
110
|
-
return [4 /*yield*/,
|
|
111
|
-
case
|
|
112
|
-
|
|
113
|
-
return [3 /*break*/,
|
|
114
|
-
case
|
|
115
|
-
err_3 =
|
|
104
|
+
return [4 /*yield*/, putEvents({ credentials: credentials, region: region }, input)];
|
|
105
|
+
case 3:
|
|
106
|
+
_e.sent();
|
|
107
|
+
return [3 /*break*/, 5];
|
|
108
|
+
case 4:
|
|
109
|
+
err_3 = _e.sent();
|
|
116
110
|
this.logger.error('Error recording analytics event', err_3);
|
|
117
111
|
throw err_3;
|
|
118
|
-
case
|
|
112
|
+
case 5: return [2 /*return*/];
|
|
119
113
|
}
|
|
120
114
|
});
|
|
121
115
|
}); };
|
|
@@ -123,17 +117,16 @@ var AWSPinpointProviderCommon = /** @class */ (function () {
|
|
|
123
117
|
if (userId === void 0) { userId = null; }
|
|
124
118
|
if (userInfo === void 0) { userInfo = null; }
|
|
125
119
|
return __awaiter(_this, void 0, void 0, function () {
|
|
126
|
-
var _a, appId,
|
|
120
|
+
var credentials, credentialsUpdated, _a, appId, endpointId, _b, endpointInfo, region, _c, address, attributes, demographic, location_1, metrics, optOut, _d, appVersion, make, model, platform, version, input, err_4;
|
|
121
|
+
var _this = this;
|
|
127
122
|
var _e;
|
|
128
123
|
return __generator(this, function (_f) {
|
|
129
124
|
switch (_f.label) {
|
|
130
|
-
case 0:
|
|
131
|
-
_a = this.config, appId = _a.appId, credentials = _a.credentials, endpointId = _a.endpointId, _b = _a.endpointInfo, endpointInfo = _b === void 0 ? {} : _b, pinpointClient = _a.pinpointClient;
|
|
132
|
-
return [4 /*yield*/, this.getCredentials()];
|
|
125
|
+
case 0: return [4 /*yield*/, this.getCredentials()];
|
|
133
126
|
case 1:
|
|
134
|
-
|
|
135
|
-
credentialsUpdated = !credentials ||
|
|
136
|
-
Object.keys(
|
|
127
|
+
credentials = _f.sent();
|
|
128
|
+
credentialsUpdated = !this.config.credentials ||
|
|
129
|
+
Object.keys(credentials).some(function (key) { return credentials[key] !== _this.config.credentials[key]; });
|
|
137
130
|
// If endpoint is already initialized, and nothing else is changing, just early return
|
|
138
131
|
if (this.endpointInitialized &&
|
|
139
132
|
!credentialsUpdated &&
|
|
@@ -142,14 +135,13 @@ var AWSPinpointProviderCommon = /** @class */ (function () {
|
|
|
142
135
|
return [2 /*return*/];
|
|
143
136
|
}
|
|
144
137
|
// Update credentials
|
|
145
|
-
this.config.credentials =
|
|
138
|
+
this.config.credentials = credentials;
|
|
139
|
+
// Assert required configuration properties to make `updateEndpoint` request are present
|
|
140
|
+
this.assertNotEmptyConfiguration();
|
|
141
|
+
_a = this.config, appId = _a.appId, endpointId = _a.endpointId, _b = _a.endpointInfo, endpointInfo = _b === void 0 ? {} : _b, region = _a.region;
|
|
146
142
|
_f.label = 2;
|
|
147
143
|
case 2:
|
|
148
144
|
_f.trys.push([2, 4, , 5]);
|
|
149
|
-
// Initialize a new pinpoint client if one isn't already configured or if credentials changed
|
|
150
|
-
if (!pinpointClient || credentialsUpdated) {
|
|
151
|
-
this.initPinpointClient();
|
|
152
|
-
}
|
|
153
145
|
_c = userInfo !== null && userInfo !== void 0 ? userInfo : {}, address = _c.address, attributes = _c.attributes, demographic = _c.demographic, location_1 = _c.location, metrics = _c.metrics, optOut = _c.optOut;
|
|
154
146
|
_d = this.clientInfo, appVersion = _d.appVersion, make = _d.make, model = _d.model, platform = _d.platform, version = _d.version;
|
|
155
147
|
input = {
|
|
@@ -166,14 +158,13 @@ var AWSPinpointProviderCommon = /** @class */ (function () {
|
|
|
166
158
|
Metrics: __assign(__assign({}, endpointInfo.metrics), metrics),
|
|
167
159
|
OptOut: optOut !== null && optOut !== void 0 ? optOut : endpointInfo.optOut,
|
|
168
160
|
User: {
|
|
169
|
-
UserId: (_e = userId !== null && userId !== void 0 ? userId : endpointInfo.userId) !== null && _e !== void 0 ? _e :
|
|
161
|
+
UserId: (_e = userId !== null && userId !== void 0 ? userId : endpointInfo.userId) !== null && _e !== void 0 ? _e : credentials.identityId,
|
|
170
162
|
UserAttributes: attributes !== null && attributes !== void 0 ? attributes : endpointInfo.userAttributes,
|
|
171
163
|
},
|
|
172
164
|
},
|
|
173
165
|
};
|
|
174
|
-
command = new UpdateEndpointCommand(input);
|
|
175
166
|
this.logger.debug('updating endpoint');
|
|
176
|
-
return [4 /*yield*/,
|
|
167
|
+
return [4 /*yield*/, updateEndpoint({ credentials: credentials, region: region }, input)];
|
|
177
168
|
case 3:
|
|
178
169
|
_f.sent();
|
|
179
170
|
this.endpointInitialized = true;
|
|
@@ -186,20 +177,6 @@ var AWSPinpointProviderCommon = /** @class */ (function () {
|
|
|
186
177
|
});
|
|
187
178
|
});
|
|
188
179
|
};
|
|
189
|
-
this.initPinpointClient = function () {
|
|
190
|
-
var _a = _this.config, appId = _a.appId, credentials = _a.credentials, pinpointClient = _a.pinpointClient, region = _a.region;
|
|
191
|
-
if (!appId || !credentials || !region) {
|
|
192
|
-
throw new Error('One or more of credentials, appId or region is not configured');
|
|
193
|
-
}
|
|
194
|
-
if (pinpointClient) {
|
|
195
|
-
pinpointClient.destroy();
|
|
196
|
-
}
|
|
197
|
-
_this.config.pinpointClient = new PinpointClient({
|
|
198
|
-
region: region,
|
|
199
|
-
credentials: credentials,
|
|
200
|
-
customUserAgent: getAmplifyUserAgent("/" + _this.getSubCategory()),
|
|
201
|
-
});
|
|
202
|
-
};
|
|
203
180
|
this.getEndpointId = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
204
181
|
var appId, cacheKey, cachedEndpointId, endpointId, ttl, expiration;
|
|
205
182
|
return __generator(this, function (_a) {
|
|
@@ -249,6 +226,12 @@ var AWSPinpointProviderCommon = /** @class */ (function () {
|
|
|
249
226
|
}
|
|
250
227
|
});
|
|
251
228
|
}); };
|
|
229
|
+
this.assertNotEmptyConfiguration = function () {
|
|
230
|
+
var _a = _this.config, appId = _a.appId, credentials = _a.credentials, region = _a.region;
|
|
231
|
+
if (!appId || !credentials || !region) {
|
|
232
|
+
throw new Error('One or more of credentials, appId or region is not configured');
|
|
233
|
+
}
|
|
234
|
+
};
|
|
252
235
|
this.config = { storage: new StorageHelper().getStorage() };
|
|
253
236
|
this.clientInfo = (_a = ClientDevice.clientInfo()) !== null && _a !== void 0 ? _a : {};
|
|
254
237
|
this.logger = logger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/AWSPinpointProviderCommon/index.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,sCAAsC;;AAEtC,OAAO,EACN,YAAY,EAEZ,WAAW,EACX,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/AWSPinpointProviderCommon/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,3 +7,4 @@ export interface AWSPinpointUserInfo extends UserInfo {
|
|
|
7
7
|
address?: string;
|
|
8
8
|
optOut?: 'ALL' | 'NONE';
|
|
9
9
|
}
|
|
10
|
+
export declare type ChannelType = 'ADM' | 'APNS' | 'APNS_SANDBOX' | 'APNS_VOIP' | 'APNS_VOIP_SANDBOX' | 'BAIDU' | 'CUSTOM' | 'EMAIL' | 'GCM' | 'IN_APP' | 'PUSH' | 'SMS' | 'VOICE';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/notifications",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.2.0",
|
|
4
4
|
"description": "Notifications category of aws-amplify",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -49,10 +49,9 @@
|
|
|
49
49
|
"src"
|
|
50
50
|
],
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@aws-amplify/cache": "5.0
|
|
53
|
-
"@aws-amplify/core": "5.
|
|
54
|
-
"@aws-amplify/rtn-push-notification": "1.1.
|
|
55
|
-
"@aws-sdk/client-pinpoint": "3.186.1",
|
|
52
|
+
"@aws-amplify/cache": "5.1.0",
|
|
53
|
+
"@aws-amplify/core": "5.4.0",
|
|
54
|
+
"@aws-amplify/rtn-push-notification": "1.1.1",
|
|
56
55
|
"lodash": "^4.17.21",
|
|
57
56
|
"uuid": "^3.2.1"
|
|
58
57
|
},
|
|
@@ -66,14 +65,14 @@
|
|
|
66
65
|
"name": "Notifications (top-level class)",
|
|
67
66
|
"path": "./lib-esm/index.js",
|
|
68
67
|
"import": "{ Amplify, Notifications }",
|
|
69
|
-
"limit": "
|
|
68
|
+
"limit": "28.75 kB"
|
|
70
69
|
},
|
|
71
70
|
{
|
|
72
71
|
"name": "Notifications (with Analytics)",
|
|
73
72
|
"path": "./lib-esm/index.js",
|
|
74
73
|
"import": "{ Amplify, Notifications, Analytics }",
|
|
75
|
-
"limit": "
|
|
74
|
+
"limit": "28.76 kB"
|
|
76
75
|
}
|
|
77
76
|
],
|
|
78
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "6a84560cb9f147e0a90a9a78125f4257c29e7e30"
|
|
79
78
|
}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
4
|
import {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
5
|
+
getInAppMessages,
|
|
6
|
+
GetInAppMessagesInput,
|
|
7
|
+
GetInAppMessagesOutput,
|
|
8
8
|
InAppMessageCampaign as PinpointInAppMessage,
|
|
9
|
-
} from '@aws-
|
|
9
|
+
} from '@aws-amplify/core/internals/aws-clients/pinpoint';
|
|
10
10
|
|
|
11
11
|
import { addEventListener, AWSPinpointProviderCommon } from '../../../common';
|
|
12
12
|
import SessionTracker, {
|
|
@@ -69,7 +69,7 @@ export default class AWSPinpointProvider
|
|
|
69
69
|
configure = (config = {}): Record<string, any> => {
|
|
70
70
|
this.config = {
|
|
71
71
|
...super.configure(config),
|
|
72
|
-
endpointInfo: { channelType:
|
|
72
|
+
endpointInfo: { channelType: 'IN_APP' },
|
|
73
73
|
};
|
|
74
74
|
|
|
75
75
|
// some configuration steps should not be re-run even if provider is re-configured for some reason
|
|
@@ -121,16 +121,17 @@ export default class AWSPinpointProvider
|
|
|
121
121
|
clearMemo();
|
|
122
122
|
try {
|
|
123
123
|
await this.updateEndpoint();
|
|
124
|
-
|
|
125
|
-
const
|
|
124
|
+
// The credentials exists assuming `updateEndpoint()` is always called before.
|
|
125
|
+
const { appId, credentials, endpointId, region } = this.config;
|
|
126
|
+
const input: GetInAppMessagesInput = {
|
|
126
127
|
ApplicationId: appId,
|
|
127
128
|
EndpointId: endpointId,
|
|
128
129
|
};
|
|
129
|
-
|
|
130
|
+
this.logger.debug('getting in-app messages');
|
|
131
|
+
const response: GetInAppMessagesOutput = await getInAppMessages(
|
|
132
|
+
{ credentials, region },
|
|
130
133
|
input
|
|
131
134
|
);
|
|
132
|
-
this.logger.debug('getting in-app messages');
|
|
133
|
-
const response = await pinpointClient.send(command);
|
|
134
135
|
const { InAppMessageCampaigns: messages } =
|
|
135
136
|
response.InAppMessagesResponse;
|
|
136
137
|
dispatchInAppMessagingEvent('getInAppMessages', messages);
|
|
@@ -2,10 +2,7 @@
|
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
4
|
import { Amplify, ConsoleLogger, Hub } from '@aws-amplify/core';
|
|
5
|
-
import {
|
|
6
|
-
InAppMessageCampaign as PinpointInAppMessage,
|
|
7
|
-
Layout as PinpointInAppMessageLayout,
|
|
8
|
-
} from '@aws-sdk/client-pinpoint';
|
|
5
|
+
import type { InAppMessageCampaign as PinpointInAppMessage } from '@aws-amplify/core/internals/aws-clients/pinpoint';
|
|
9
6
|
import isEmpty from 'lodash/isEmpty';
|
|
10
7
|
import { AMPLIFY_SYMBOL } from '../../../common';
|
|
11
8
|
import {
|
|
@@ -218,11 +215,11 @@ export const clearMemo = () => {
|
|
|
218
215
|
export const interpretLayout = (
|
|
219
216
|
layout: PinpointInAppMessage['InAppMessage']['Layout']
|
|
220
217
|
): InAppMessageLayout => {
|
|
221
|
-
if (layout ===
|
|
218
|
+
if (layout === 'MOBILE_FEED') {
|
|
222
219
|
return 'MODAL';
|
|
223
220
|
}
|
|
224
221
|
|
|
225
|
-
if (layout ===
|
|
222
|
+
if (layout === 'OVERLAYS') {
|
|
226
223
|
return 'FULL_SCREEN';
|
|
227
224
|
}
|
|
228
225
|
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
|
-
import { ChannelType } from '@aws-sdk/client-pinpoint';
|
|
5
4
|
import { addEventListener, AWSPinpointProviderCommon } from '../../../common';
|
|
5
|
+
import { ChannelType } from '../../../common/AWSPinpointProviderCommon/types';
|
|
6
6
|
import PlatformNotSupportedError from '../../PlatformNotSupportedError';
|
|
7
7
|
import { Platform } from '../../Platform';
|
|
8
8
|
import {
|
|
@@ -108,11 +108,11 @@ export default class AWSPinpointProvider
|
|
|
108
108
|
switch (Platform.OS) {
|
|
109
109
|
case 'android': {
|
|
110
110
|
// FCM was previously known as GCM and continues to be the channel type in Pinpoint
|
|
111
|
-
return
|
|
111
|
+
return 'GCM';
|
|
112
112
|
}
|
|
113
113
|
case 'ios': {
|
|
114
114
|
// If building in debug mode, use the APNs sandbox
|
|
115
|
-
return global['__DEV__'] ?
|
|
115
|
+
return global['__DEV__'] ? 'APNS_SANDBOX' : 'APNS';
|
|
116
116
|
}
|
|
117
117
|
default: {
|
|
118
118
|
throw new PlatformNotSupportedError();
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
|
-
import { Event as AWSPinpointAnalyticsEvent } from '@aws-
|
|
4
|
+
import type { Event as AWSPinpointAnalyticsEvent } from '@aws-amplify/core/internals/aws-clients/pinpoint';
|
|
5
5
|
import { ConsoleLogger, Hub } from '@aws-amplify/core';
|
|
6
6
|
import { AMPLIFY_SYMBOL } from '../../../common';
|
|
7
7
|
import { PushNotificationMessage } from '../../types';
|