@aws-amplify/notifications 1.2.1-unstable.2e1e1f5.7 → 1.2.1-unstable.b09310f.11
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/common/AWSPinpointProviderCommon/index.d.ts +1 -0
- package/lib/common/AWSPinpointProviderCommon/index.js +18 -2
- package/lib/common/AWSPinpointProviderCommon/index.js.map +1 -1
- package/lib-esm/common/AWSPinpointProviderCommon/index.d.ts +1 -0
- package/lib-esm/common/AWSPinpointProviderCommon/index.js +19 -3
- package/lib-esm/common/AWSPinpointProviderCommon/index.js.map +1 -1
- package/package.json +7 -7
- package/src/common/AWSPinpointProviderCommon/index.ts +30 -2
|
@@ -26,6 +26,7 @@ export default abstract class AWSPinpointProviderCommon implements Notifications
|
|
|
26
26
|
configure(config?: {}): Record<string, any>;
|
|
27
27
|
identifyUser: (userId: string, userInfo: UserInfo) => Promise<void>;
|
|
28
28
|
protected init: () => Promise<void>;
|
|
29
|
+
private getUserAgentValue;
|
|
29
30
|
protected recordAnalyticsEvent: (event: AWSPinpointAnalyticsEvent) => Promise<void>;
|
|
30
31
|
protected updateEndpoint: (userId?: string, userInfo?: AWSPinpointUserInfo) => Promise<void>;
|
|
31
32
|
private getEndpointId;
|
|
@@ -71,6 +71,22 @@ var AWSPinpointProviderCommon = /** @class */ (function () {
|
|
|
71
71
|
}
|
|
72
72
|
});
|
|
73
73
|
}); };
|
|
74
|
+
this.getUserAgentValue = function () {
|
|
75
|
+
var customUserAgentDetails;
|
|
76
|
+
if (_this.getSubCategory() === 'PushNotification') {
|
|
77
|
+
customUserAgentDetails = {
|
|
78
|
+
category: core_1.Category.PushNotification,
|
|
79
|
+
action: core_1.PushNotificationAction.None,
|
|
80
|
+
};
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
customUserAgentDetails = {
|
|
84
|
+
category: core_1.Category.InAppMessaging,
|
|
85
|
+
action: core_1.InAppMessagingAction.None,
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
return core_1.getAmplifyUserAgentString(customUserAgentDetails);
|
|
89
|
+
};
|
|
74
90
|
this.recordAnalyticsEvent = function (event) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
75
91
|
var _a, _b, appId, credentials, endpointId, region, input, err_3;
|
|
76
92
|
var _c, _d;
|
|
@@ -103,7 +119,7 @@ var AWSPinpointProviderCommon = /** @class */ (function () {
|
|
|
103
119
|
},
|
|
104
120
|
};
|
|
105
121
|
this.logger.debug('recording analytics event');
|
|
106
|
-
return [4 /*yield*/, pinpoint_1.putEvents({ credentials: credentials, region: region }, input)];
|
|
122
|
+
return [4 /*yield*/, pinpoint_1.putEvents({ credentials: credentials, region: region, userAgentValue: this.getUserAgentValue() }, input)];
|
|
107
123
|
case 3:
|
|
108
124
|
_e.sent();
|
|
109
125
|
return [3 /*break*/, 5];
|
|
@@ -166,7 +182,7 @@ var AWSPinpointProviderCommon = /** @class */ (function () {
|
|
|
166
182
|
},
|
|
167
183
|
};
|
|
168
184
|
this.logger.debug('updating endpoint');
|
|
169
|
-
return [4 /*yield*/, pinpoint_1.updateEndpoint({ credentials: credentials, region: region }, input)];
|
|
185
|
+
return [4 /*yield*/, pinpoint_1.updateEndpoint({ credentials: credentials, region: region, userAgentValue: this.getUserAgentValue() }, input)];
|
|
170
186
|
case 3:
|
|
171
187
|
_f.sent();
|
|
172
188
|
this.endpointInitialized = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/AWSPinpointProviderCommon/index.ts"],"names":[],"mappings":";AAAA,qEAAqE;AACrE,sCAAsC;;;AAEtC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/AWSPinpointProviderCommon/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,6 +26,7 @@ export default abstract class AWSPinpointProviderCommon implements Notifications
|
|
|
26
26
|
configure(config?: {}): Record<string, any>;
|
|
27
27
|
identifyUser: (userId: string, userInfo: UserInfo) => Promise<void>;
|
|
28
28
|
protected init: () => Promise<void>;
|
|
29
|
+
private getUserAgentValue;
|
|
29
30
|
protected recordAnalyticsEvent: (event: AWSPinpointAnalyticsEvent) => Promise<void>;
|
|
30
31
|
protected updateEndpoint: (userId?: string, userInfo?: AWSPinpointUserInfo) => Promise<void>;
|
|
31
32
|
private getEndpointId;
|
|
@@ -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
|
import { __assign, __awaiter, __generator } from "tslib";
|
|
4
|
-
import { ClientDevice, Credentials, StorageHelper, transferKeyToUpperCase, } from '@aws-amplify/core';
|
|
4
|
+
import { Category, ClientDevice, Credentials, getAmplifyUserAgentString, InAppMessagingAction, PushNotificationAction, StorageHelper, transferKeyToUpperCase, } from '@aws-amplify/core';
|
|
5
5
|
import { Cache } from '@aws-amplify/cache';
|
|
6
6
|
import { putEvents, updateEndpoint, } from '@aws-amplify/core/internals/aws-clients/pinpoint';
|
|
7
7
|
import { v4 as uuid } from 'uuid';
|
|
@@ -69,6 +69,22 @@ var AWSPinpointProviderCommon = /** @class */ (function () {
|
|
|
69
69
|
}
|
|
70
70
|
});
|
|
71
71
|
}); };
|
|
72
|
+
this.getUserAgentValue = function () {
|
|
73
|
+
var customUserAgentDetails;
|
|
74
|
+
if (_this.getSubCategory() === 'PushNotification') {
|
|
75
|
+
customUserAgentDetails = {
|
|
76
|
+
category: Category.PushNotification,
|
|
77
|
+
action: PushNotificationAction.None,
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
else {
|
|
81
|
+
customUserAgentDetails = {
|
|
82
|
+
category: Category.InAppMessaging,
|
|
83
|
+
action: InAppMessagingAction.None,
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
return getAmplifyUserAgentString(customUserAgentDetails);
|
|
87
|
+
};
|
|
72
88
|
this.recordAnalyticsEvent = function (event) { return __awaiter(_this, void 0, void 0, function () {
|
|
73
89
|
var _a, _b, appId, credentials, endpointId, region, input, err_3;
|
|
74
90
|
var _c, _d;
|
|
@@ -101,7 +117,7 @@ var AWSPinpointProviderCommon = /** @class */ (function () {
|
|
|
101
117
|
},
|
|
102
118
|
};
|
|
103
119
|
this.logger.debug('recording analytics event');
|
|
104
|
-
return [4 /*yield*/, putEvents({ credentials: credentials, region: region }, input)];
|
|
120
|
+
return [4 /*yield*/, putEvents({ credentials: credentials, region: region, userAgentValue: this.getUserAgentValue() }, input)];
|
|
105
121
|
case 3:
|
|
106
122
|
_e.sent();
|
|
107
123
|
return [3 /*break*/, 5];
|
|
@@ -164,7 +180,7 @@ var AWSPinpointProviderCommon = /** @class */ (function () {
|
|
|
164
180
|
},
|
|
165
181
|
};
|
|
166
182
|
this.logger.debug('updating endpoint');
|
|
167
|
-
return [4 /*yield*/, updateEndpoint({ credentials: credentials, region: region }, input)];
|
|
183
|
+
return [4 /*yield*/, updateEndpoint({ credentials: credentials, region: region, userAgentValue: this.getUserAgentValue() }, input)];
|
|
168
184
|
case 3:
|
|
169
185
|
_f.sent();
|
|
170
186
|
this.endpointInitialized = true;
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/AWSPinpointProviderCommon/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/notifications",
|
|
3
|
-
"version": "1.2.1-unstable.
|
|
3
|
+
"version": "1.2.1-unstable.b09310f.11+b09310f32",
|
|
4
4
|
"description": "Notifications category of aws-amplify",
|
|
5
5
|
"main": "./lib/index.js",
|
|
6
6
|
"module": "./lib-esm/index.js",
|
|
@@ -49,9 +49,9 @@
|
|
|
49
49
|
"src"
|
|
50
50
|
],
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"@aws-amplify/cache": "5.1.1-unstable.
|
|
53
|
-
"@aws-amplify/core": "5.4.1-unstable.
|
|
54
|
-
"@aws-amplify/rtn-push-notification": "1.1.2-unstable.
|
|
52
|
+
"@aws-amplify/cache": "5.1.1-unstable.b09310f.11+b09310f32",
|
|
53
|
+
"@aws-amplify/core": "5.4.1-unstable.b09310f.11+b09310f32",
|
|
54
|
+
"@aws-amplify/rtn-push-notification": "1.1.2-unstable.b09310f.37+b09310f32",
|
|
55
55
|
"lodash": "^4.17.21",
|
|
56
56
|
"uuid": "^3.2.1"
|
|
57
57
|
},
|
|
@@ -65,14 +65,14 @@
|
|
|
65
65
|
"name": "Notifications (top-level class)",
|
|
66
66
|
"path": "./lib-esm/index.js",
|
|
67
67
|
"import": "{ Amplify, Notifications }",
|
|
68
|
-
"limit": "
|
|
68
|
+
"limit": "29.8 kB"
|
|
69
69
|
},
|
|
70
70
|
{
|
|
71
71
|
"name": "Notifications (with Analytics)",
|
|
72
72
|
"path": "./lib-esm/index.js",
|
|
73
73
|
"import": "{ Amplify, Notifications, Analytics }",
|
|
74
|
-
"limit": "
|
|
74
|
+
"limit": "29.8 kB"
|
|
75
75
|
}
|
|
76
76
|
],
|
|
77
|
-
"gitHead": "
|
|
77
|
+
"gitHead": "b09310f326ec54a6b29a09a60035521f8d0dfb29"
|
|
78
78
|
}
|
|
@@ -2,9 +2,14 @@
|
|
|
2
2
|
// SPDX-License-Identifier: Apache-2.0
|
|
3
3
|
|
|
4
4
|
import {
|
|
5
|
+
Category,
|
|
5
6
|
ClientDevice,
|
|
6
7
|
ConsoleLogger,
|
|
7
8
|
Credentials,
|
|
9
|
+
CustomUserAgentDetails,
|
|
10
|
+
getAmplifyUserAgentString,
|
|
11
|
+
InAppMessagingAction,
|
|
12
|
+
PushNotificationAction,
|
|
8
13
|
StorageHelper,
|
|
9
14
|
transferKeyToUpperCase,
|
|
10
15
|
} from '@aws-amplify/core';
|
|
@@ -102,6 +107,23 @@ export default abstract class AWSPinpointProviderCommon
|
|
|
102
107
|
}
|
|
103
108
|
};
|
|
104
109
|
|
|
110
|
+
private getUserAgentValue = (): string => {
|
|
111
|
+
let customUserAgentDetails: CustomUserAgentDetails;
|
|
112
|
+
if (this.getSubCategory() === 'PushNotification') {
|
|
113
|
+
customUserAgentDetails = {
|
|
114
|
+
category: Category.PushNotification,
|
|
115
|
+
action: PushNotificationAction.None,
|
|
116
|
+
};
|
|
117
|
+
} else {
|
|
118
|
+
customUserAgentDetails = {
|
|
119
|
+
category: Category.InAppMessaging,
|
|
120
|
+
action: InAppMessagingAction.None,
|
|
121
|
+
};
|
|
122
|
+
}
|
|
123
|
+
|
|
124
|
+
return getAmplifyUserAgentString(customUserAgentDetails);
|
|
125
|
+
};
|
|
126
|
+
|
|
105
127
|
protected recordAnalyticsEvent = async (
|
|
106
128
|
event: AWSPinpointAnalyticsEvent
|
|
107
129
|
): Promise<void> => {
|
|
@@ -127,7 +149,10 @@ export default abstract class AWSPinpointProviderCommon
|
|
|
127
149
|
},
|
|
128
150
|
};
|
|
129
151
|
this.logger.debug('recording analytics event');
|
|
130
|
-
await putEvents(
|
|
152
|
+
await putEvents(
|
|
153
|
+
{ credentials, region, userAgentValue: this.getUserAgentValue() },
|
|
154
|
+
input
|
|
155
|
+
);
|
|
131
156
|
} catch (err) {
|
|
132
157
|
this.logger.error('Error recording analytics event', err);
|
|
133
158
|
throw err;
|
|
@@ -204,7 +229,10 @@ export default abstract class AWSPinpointProviderCommon
|
|
|
204
229
|
},
|
|
205
230
|
};
|
|
206
231
|
this.logger.debug('updating endpoint');
|
|
207
|
-
await updateEndpoint(
|
|
232
|
+
await updateEndpoint(
|
|
233
|
+
{ credentials, region, userAgentValue: this.getUserAgentValue() },
|
|
234
|
+
input
|
|
235
|
+
);
|
|
208
236
|
this.endpointInitialized = true;
|
|
209
237
|
} catch (err) {
|
|
210
238
|
throw err;
|