@adobe/alloy 2.14.0-alpha.3 → 2.14.0-alpha.5
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/libEs5/components/DataCollector/index.js +26 -10
- package/libEs5/components/DataCollector/validateUserEventOptions.js +2 -1
- package/libEs5/components/Identity/appendIdentityToUrl/appendIdentityToUrlOptionsValidator.js +4 -1
- package/libEs5/components/Identity/createComponent.js +2 -2
- package/libEs5/components/Identity/getIdentity/createGetIdentity.js +11 -3
- package/libEs5/components/Identity/getIdentity/getIdentityOptionsValidator.js +8 -11
- package/libEs5/components/Identity/index.js +8 -4
- package/libEs5/components/Privacy/createComponent.js +4 -2
- package/libEs5/components/Privacy/index.js +2 -1
- package/libEs5/components/Privacy/injectSendSetConsentRequest.js +6 -2
- package/libEs5/components/Privacy/validateSetConsentOptions.js +2 -1
- package/libEs5/constants/libraryVersion.js +1 -1
- package/libEs5/core/config/createCoreConfigs.js +2 -1
- package/libEs5/core/createEventManager.js +5 -1
- package/libEs5/utils/filterObject.js +57 -0
- package/libEs5/utils/index.js +24 -0
- package/libEs5/utils/prepareConfigOverridesForEdge.js +61 -0
- package/libEs5/utils/request/createRequestPayload.js +6 -0
- package/libEs5/utils/validateConfigOverride.js +20 -0
- package/libEs6/components/DataCollector/index.js +25 -10
- package/libEs6/components/DataCollector/validateUserEventOptions.js +3 -2
- package/libEs6/components/Identity/appendIdentityToUrl/appendIdentityToUrlOptionsValidator.js +3 -1
- package/libEs6/components/Identity/createComponent.js +2 -2
- package/libEs6/components/Identity/getIdentity/createGetIdentity.js +10 -3
- package/libEs6/components/Identity/getIdentity/getIdentityOptionsValidator.js +6 -10
- package/libEs6/components/Identity/index.js +8 -4
- package/libEs6/components/Privacy/createComponent.js +4 -2
- package/libEs6/components/Privacy/index.js +2 -1
- package/libEs6/components/Privacy/injectSendSetConsentRequest.js +6 -2
- package/libEs6/components/Privacy/validateSetConsentOptions.js +3 -2
- package/libEs6/constants/libraryVersion.js +1 -1
- package/libEs6/core/config/createCoreConfigs.js +3 -2
- package/libEs6/core/createEventManager.js +5 -1
- package/libEs6/utils/filterObject.js +59 -0
- package/libEs6/utils/index.js +3 -0
- package/libEs6/utils/prepareConfigOverridesForEdge.js +57 -0
- package/libEs6/utils/request/createRequestPayload.js +3 -1
- package/libEs6/utils/validateConfigOverride.js +13 -0
- package/package.json +2 -2
|
@@ -6,6 +6,8 @@ var _validateUserEventOptions = require("./validateUserEventOptions");
|
|
|
6
6
|
|
|
7
7
|
var _validateApplyResponse = require("./validateApplyResponse");
|
|
8
8
|
|
|
9
|
+
var _utils = require("../../utils");
|
|
10
|
+
|
|
9
11
|
/*
|
|
10
12
|
Copyright 2019 Adobe. All rights reserved.
|
|
11
13
|
This file is licensed to you under the Apache License, Version 2.0 (the "License");
|
|
@@ -18,7 +20,8 @@ OF ANY KIND, either express or implied. See the License for the specific languag
|
|
|
18
20
|
governing permissions and limitations under the License.
|
|
19
21
|
*/
|
|
20
22
|
var createDataCollector = function createDataCollector(_ref) {
|
|
21
|
-
var eventManager = _ref.eventManager
|
|
23
|
+
var eventManager = _ref.eventManager,
|
|
24
|
+
logger = _ref.logger;
|
|
22
25
|
return {
|
|
23
26
|
commands: {
|
|
24
27
|
sendEvent: {
|
|
@@ -41,7 +44,8 @@ var createDataCollector = function createDataCollector(_ref) {
|
|
|
41
44
|
decisionScopes = _options$decisionScop === void 0 ? [] : _options$decisionScop,
|
|
42
45
|
_options$personalizat = options.personalization,
|
|
43
46
|
personalization = _options$personalizat === void 0 ? {} : _options$personalizat,
|
|
44
|
-
datasetId = options.datasetId
|
|
47
|
+
datasetId = options.datasetId,
|
|
48
|
+
edgeConfigOverrides = options.edgeConfigOverrides;
|
|
45
49
|
var event = eventManager.createEvent();
|
|
46
50
|
|
|
47
51
|
if (documentUnloading) {
|
|
@@ -63,19 +67,31 @@ var createDataCollector = function createDataCollector(_ref) {
|
|
|
63
67
|
});
|
|
64
68
|
}
|
|
65
69
|
|
|
70
|
+
var sendEventOptions = {
|
|
71
|
+
renderDecisions: renderDecisions,
|
|
72
|
+
decisionScopes: decisionScopes,
|
|
73
|
+
personalization: personalization
|
|
74
|
+
};
|
|
75
|
+
|
|
76
|
+
if (edgeConfigOverrides) {
|
|
77
|
+
sendEventOptions.edgeConfigOverrides = edgeConfigOverrides;
|
|
78
|
+
}
|
|
79
|
+
|
|
66
80
|
if (datasetId) {
|
|
67
|
-
event.
|
|
68
|
-
|
|
69
|
-
|
|
81
|
+
logger.warn("The 'datasetId' option has been deprecated. Please use 'edgeConfigOverrides.experience_platform.datasets.event' instead.");
|
|
82
|
+
sendEventOptions.edgeConfigOverrides = edgeConfigOverrides || {};
|
|
83
|
+
(0, _utils.deepAssign)(sendEventOptions.edgeConfigOverrides, {
|
|
84
|
+
com_adobe_experience_platform: {
|
|
85
|
+
datasets: {
|
|
86
|
+
event: {
|
|
87
|
+
datasetId: datasetId
|
|
88
|
+
}
|
|
89
|
+
}
|
|
70
90
|
}
|
|
71
91
|
});
|
|
72
92
|
}
|
|
73
93
|
|
|
74
|
-
return eventManager.sendEvent(event,
|
|
75
|
-
renderDecisions: renderDecisions,
|
|
76
|
-
decisionScopes: decisionScopes,
|
|
77
|
-
personalization: personalization
|
|
78
|
-
});
|
|
94
|
+
return eventManager.sendEvent(event, sendEventOptions);
|
|
79
95
|
}
|
|
80
96
|
},
|
|
81
97
|
applyResponse: {
|
|
@@ -40,7 +40,8 @@ var _default = function _default(_ref) {
|
|
|
40
40
|
surfaces: (0, _validation.arrayOf)((0, _validation.string)()).uniqueItems()
|
|
41
41
|
}),
|
|
42
42
|
datasetId: (0, _validation.string)(),
|
|
43
|
-
mergeId: (0, _validation.string)()
|
|
43
|
+
mergeId: (0, _validation.string)(),
|
|
44
|
+
edgeConfigOverrides: _utils.validateConfigOverride
|
|
44
45
|
}).required().noUnknownFields();
|
|
45
46
|
return eventOptionsValidator(options);
|
|
46
47
|
};
|
package/libEs5/components/Identity/appendIdentityToUrl/appendIdentityToUrlOptionsValidator.js
CHANGED
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
exports.default = void 0;
|
|
4
4
|
|
|
5
|
+
var _utils = require("../../../utils");
|
|
6
|
+
|
|
5
7
|
var _validation = require("../../../utils/validation");
|
|
6
8
|
|
|
7
9
|
/*
|
|
@@ -22,7 +24,8 @@ governing permissions and limitations under the License.
|
|
|
22
24
|
* @returns {*} Validated options
|
|
23
25
|
*/
|
|
24
26
|
var _default = (0, _validation.objectOf)({
|
|
25
|
-
url: (0, _validation.string)().required().nonEmpty()
|
|
27
|
+
url: (0, _validation.string)().required().nonEmpty(),
|
|
28
|
+
edgeConfigOverrides: _utils.validateConfigOverride
|
|
26
29
|
}).required().noUnknownFields();
|
|
27
30
|
|
|
28
31
|
exports.default = _default;
|
|
@@ -60,7 +60,7 @@ var _default = function _default(_ref) {
|
|
|
60
60
|
optionsValidator: _getIdentityOptionsValidator.default,
|
|
61
61
|
run: function run(options) {
|
|
62
62
|
return consent.awaitConsent().then(function () {
|
|
63
|
-
return ecid ? undefined : getIdentity(options
|
|
63
|
+
return ecid ? undefined : getIdentity(options);
|
|
64
64
|
}).then(function () {
|
|
65
65
|
return {
|
|
66
66
|
identity: {
|
|
@@ -75,7 +75,7 @@ var _default = function _default(_ref) {
|
|
|
75
75
|
optionsValidator: _appendIdentityToUrlOptionsValidator.default,
|
|
76
76
|
run: function run(options) {
|
|
77
77
|
return consent.withConsent().then(function () {
|
|
78
|
-
return ecid ? undefined : getIdentity(options
|
|
78
|
+
return ecid ? undefined : getIdentity(options);
|
|
79
79
|
}).then(function () {
|
|
80
80
|
return {
|
|
81
81
|
url: appendIdentityToUrl(ecid, options.url)
|
|
@@ -16,10 +16,18 @@ governing permissions and limitations under the License.
|
|
|
16
16
|
var _default = function _default(_ref) {
|
|
17
17
|
var sendEdgeNetworkRequest = _ref.sendEdgeNetworkRequest,
|
|
18
18
|
createIdentityRequestPayload = _ref.createIdentityRequestPayload,
|
|
19
|
-
createIdentityRequest = _ref.createIdentityRequest
|
|
20
|
-
|
|
19
|
+
createIdentityRequest = _ref.createIdentityRequest,
|
|
20
|
+
globalConfigOverrides = _ref.globalConfigOverrides;
|
|
21
|
+
return function () {
|
|
22
|
+
var _ref2 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
|
|
23
|
+
namespaces = _ref2.namespaces,
|
|
24
|
+
localConfigOverrides = _ref2.edgeConfigOverrides;
|
|
25
|
+
|
|
21
26
|
var payload = createIdentityRequestPayload(namespaces);
|
|
22
|
-
var request = createIdentityRequest(payload);
|
|
27
|
+
var request = createIdentityRequest(payload); // merge the configurations, but give preference to the command-local configs
|
|
28
|
+
|
|
29
|
+
payload.mergeConfigOverride(globalConfigOverrides);
|
|
30
|
+
payload.mergeConfigOverride(localConfigOverrides);
|
|
23
31
|
return sendEdgeNetworkRequest({
|
|
24
32
|
request: request
|
|
25
33
|
});
|
|
@@ -2,6 +2,8 @@
|
|
|
2
2
|
|
|
3
3
|
exports.default = void 0;
|
|
4
4
|
|
|
5
|
+
var _utils = require("../../../utils");
|
|
6
|
+
|
|
5
7
|
var _validation = require("../../../utils/validation");
|
|
6
8
|
|
|
7
9
|
/*
|
|
@@ -21,16 +23,11 @@ governing permissions and limitations under the License.
|
|
|
21
23
|
* @param {*} options The user event options to validate
|
|
22
24
|
* @returns {*} Validated options
|
|
23
25
|
*/
|
|
24
|
-
var _default =
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
return {
|
|
32
|
-
namespaces: ["ECID"]
|
|
33
|
-
};
|
|
34
|
-
};
|
|
26
|
+
var _default = (0, _validation.objectOf)({
|
|
27
|
+
namespaces: (0, _validation.arrayOf)((0, _validation.literal)("ECID")).nonEmpty().uniqueItems().default(["ECID"]),
|
|
28
|
+
edgeConfigOverrides: _utils.validateConfigOverride
|
|
29
|
+
}).noUnknownFields().default({
|
|
30
|
+
namespaces: ["ECID"]
|
|
31
|
+
});
|
|
35
32
|
|
|
36
33
|
exports.default = _default;
|
|
@@ -61,7 +61,8 @@ var createIdentity = function createIdentity(_ref) {
|
|
|
61
61
|
sendEdgeNetworkRequest = _ref.sendEdgeNetworkRequest,
|
|
62
62
|
apexDomain = _ref.apexDomain;
|
|
63
63
|
var orgId = config.orgId,
|
|
64
|
-
thirdPartyCookiesEnabled = config.thirdPartyCookiesEnabled
|
|
64
|
+
thirdPartyCookiesEnabled = config.thirdPartyCookiesEnabled,
|
|
65
|
+
globalConfigOverrides = config.edgeConfigOverrides;
|
|
65
66
|
var getEcidFromVisitor = (0, _injectGetEcidFromVisitor.default)({
|
|
66
67
|
logger: logger,
|
|
67
68
|
orgId: orgId,
|
|
@@ -84,7 +85,8 @@ var createIdentity = function createIdentity(_ref) {
|
|
|
84
85
|
var getIdentity = (0, _createGetIdentity.default)({
|
|
85
86
|
sendEdgeNetworkRequest: sendEdgeNetworkRequest,
|
|
86
87
|
createIdentityRequestPayload: _createIdentityRequestPayload.default,
|
|
87
|
-
createIdentityRequest: _createIdentityRequest.default
|
|
88
|
+
createIdentityRequest: _createIdentityRequest.default,
|
|
89
|
+
globalConfigOverrides: globalConfigOverrides
|
|
88
90
|
});
|
|
89
91
|
var setDomainForInitialIdentityPayload = (0, _injectSetDomainForInitialIdentityPayload.default)({
|
|
90
92
|
thirdPartyCookiesEnabled: thirdPartyCookiesEnabled,
|
|
@@ -124,7 +126,8 @@ var createIdentity = function createIdentity(_ref) {
|
|
|
124
126
|
dateProvider: function dateProvider() {
|
|
125
127
|
return new Date();
|
|
126
128
|
},
|
|
127
|
-
orgId: orgId
|
|
129
|
+
orgId: orgId,
|
|
130
|
+
globalConfigOverrides: globalConfigOverrides
|
|
128
131
|
});
|
|
129
132
|
return (0, _createComponent.default)({
|
|
130
133
|
addEcidQueryToPayload: _addEcidQueryToPayload.default,
|
|
@@ -136,7 +139,8 @@ var createIdentity = function createIdentity(_ref) {
|
|
|
136
139
|
getIdentity: getIdentity,
|
|
137
140
|
consent: consent,
|
|
138
141
|
appendIdentityToUrl: appendIdentityToUrl,
|
|
139
|
-
logger: logger
|
|
142
|
+
logger: logger,
|
|
143
|
+
config: config
|
|
140
144
|
});
|
|
141
145
|
};
|
|
142
146
|
|
|
@@ -52,14 +52,16 @@ var _default = function _default(_ref) {
|
|
|
52
52
|
optionsValidator: validateSetConsentOptions,
|
|
53
53
|
run: function run(_ref2) {
|
|
54
54
|
var consentOptions = _ref2.consent,
|
|
55
|
-
identityMap = _ref2.identityMap
|
|
55
|
+
identityMap = _ref2.identityMap,
|
|
56
|
+
edgeConfigOverrides = _ref2.edgeConfigOverrides;
|
|
56
57
|
consent.suspend();
|
|
57
58
|
var consentHashes = consentHashStore.lookup(consentOptions);
|
|
58
59
|
return taskQueue.addTask(function () {
|
|
59
60
|
if (consentHashes.isNew()) {
|
|
60
61
|
return sendSetConsentRequest({
|
|
61
62
|
consentOptions: consentOptions,
|
|
62
|
-
identityMap: identityMap
|
|
63
|
+
identityMap: identityMap,
|
|
64
|
+
edgeConfigOverrides: edgeConfigOverrides
|
|
63
65
|
});
|
|
64
66
|
}
|
|
65
67
|
|
|
@@ -47,7 +47,8 @@ var createPrivacy = function createPrivacy(_ref) {
|
|
|
47
47
|
var sendSetConsentRequest = (0, _injectSendSetConsentRequest.default)({
|
|
48
48
|
createConsentRequestPayload: _createConsentRequestPayload.default,
|
|
49
49
|
createConsentRequest: _createConsentRequest.default,
|
|
50
|
-
sendEdgeNetworkRequest: sendEdgeNetworkRequest
|
|
50
|
+
sendEdgeNetworkRequest: sendEdgeNetworkRequest,
|
|
51
|
+
edgeConfigOverrides: config.edgeConfigOverrides
|
|
51
52
|
});
|
|
52
53
|
var storage = createNamespacedStorage((0, _utils.sanitizeOrgIdForCookieName)(orgId) + ".consentHashes.");
|
|
53
54
|
var consentHashStore = (0, _createConsentHashStore.default)({
|
|
@@ -18,12 +18,16 @@ governing permissions and limitations under the License.
|
|
|
18
18
|
var _default = function _default(_ref) {
|
|
19
19
|
var createConsentRequestPayload = _ref.createConsentRequestPayload,
|
|
20
20
|
createConsentRequest = _ref.createConsentRequest,
|
|
21
|
-
sendEdgeNetworkRequest = _ref.sendEdgeNetworkRequest
|
|
21
|
+
sendEdgeNetworkRequest = _ref.sendEdgeNetworkRequest,
|
|
22
|
+
globalConfigOverrides = _ref.edgeConfigOverrides;
|
|
22
23
|
return function (_ref2) {
|
|
23
24
|
var consentOptions = _ref2.consentOptions,
|
|
24
|
-
identityMap = _ref2.identityMap
|
|
25
|
+
identityMap = _ref2.identityMap,
|
|
26
|
+
localConfigOverrides = _ref2.edgeConfigOverrides;
|
|
25
27
|
var payload = createConsentRequestPayload();
|
|
26
28
|
payload.setConsent(consentOptions);
|
|
29
|
+
payload.mergeConfigOverride(globalConfigOverrides);
|
|
30
|
+
payload.mergeConfigOverride(localConfigOverrides);
|
|
27
31
|
|
|
28
32
|
if ((0, _utils.isObject)(identityMap)) {
|
|
29
33
|
Object.keys(identityMap).forEach(function (key) {
|
|
@@ -8,7 +8,8 @@ var _utils = require("../../utils");
|
|
|
8
8
|
|
|
9
9
|
var _default = (0, _validation.objectOf)({
|
|
10
10
|
consent: (0, _validation.arrayOf)((0, _validation.anything)()).required().nonEmpty(),
|
|
11
|
-
identityMap: _utils.validateIdentityMap
|
|
11
|
+
identityMap: _utils.validateIdentityMap,
|
|
12
|
+
edgeConfigOverrides: _utils.validateConfigOverride
|
|
12
13
|
}).noUnknownFields().required();
|
|
13
14
|
|
|
14
15
|
exports.default = _default;
|
|
@@ -15,5 +15,5 @@ governing permissions and limitations under the License.
|
|
|
15
15
|
*/
|
|
16
16
|
// The __VERSION__ keyword will be replace at alloy build time with the package.json version.
|
|
17
17
|
// see babel-plugin-version
|
|
18
|
-
var _default = "2.14.0-alpha.
|
|
18
|
+
var _default = "2.14.0-alpha.5";
|
|
19
19
|
exports.default = _default;
|
|
@@ -31,7 +31,8 @@ var _default = function _default() {
|
|
|
31
31
|
edgeDomain: (0, _validation.string)().domain().default(_domain.EDGE),
|
|
32
32
|
edgeBasePath: (0, _validation.string)().nonEmpty().default(_edgeBasePath.default),
|
|
33
33
|
orgId: (0, _validation.string)().unique().required(),
|
|
34
|
-
onBeforeEventSend: (0, _validation.callback)().default(_utils.noop)
|
|
34
|
+
onBeforeEventSend: (0, _validation.callback)().default(_utils.noop),
|
|
35
|
+
edgeConfigOverrides: _utils.validateConfigOverride
|
|
35
36
|
};
|
|
36
37
|
};
|
|
37
38
|
|
|
@@ -29,7 +29,8 @@ var _default = function _default(_ref) {
|
|
|
29
29
|
createDataCollectionRequest = _ref.createDataCollectionRequest,
|
|
30
30
|
sendEdgeNetworkRequest = _ref.sendEdgeNetworkRequest,
|
|
31
31
|
_applyResponse = _ref.applyResponse;
|
|
32
|
-
var onBeforeEventSend = config.onBeforeEventSend
|
|
32
|
+
var onBeforeEventSend = config.onBeforeEventSend,
|
|
33
|
+
globalConfigOverrides = config.edgeConfigOverrides;
|
|
33
34
|
return {
|
|
34
35
|
createEvent: createEvent,
|
|
35
36
|
|
|
@@ -54,11 +55,14 @@ var _default = function _default(_ref) {
|
|
|
54
55
|
var _options$renderDecisi = options.renderDecisions,
|
|
55
56
|
renderDecisions = _options$renderDecisi === void 0 ? false : _options$renderDecisi,
|
|
56
57
|
decisionScopes = options.decisionScopes,
|
|
58
|
+
localConfigOverrides = options.edgeConfigOverrides,
|
|
57
59
|
personalization = options.personalization;
|
|
58
60
|
var payload = createDataCollectionRequestPayload();
|
|
59
61
|
var request = createDataCollectionRequest(payload);
|
|
60
62
|
var onResponseCallbackAggregator = (0, _utils.createCallbackAggregator)();
|
|
61
63
|
var onRequestFailureCallbackAggregator = (0, _utils.createCallbackAggregator)();
|
|
64
|
+
payload.mergeConfigOverride(globalConfigOverrides);
|
|
65
|
+
payload.mergeConfigOverride(localConfigOverrides);
|
|
62
66
|
return lifecycle.onBeforeEvent({
|
|
63
67
|
event: event,
|
|
64
68
|
renderDecisions: renderDecisions,
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
exports.default = void 0;
|
|
4
|
+
|
|
5
|
+
var _isEmptyObject = require("./isEmptyObject");
|
|
6
|
+
|
|
7
|
+
var _isNil = require("./isNil");
|
|
8
|
+
|
|
9
|
+
var _isObject = require("./isObject");
|
|
10
|
+
|
|
11
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
12
|
+
|
|
13
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
14
|
+
|
|
15
|
+
function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
16
|
+
|
|
17
|
+
/**
|
|
18
|
+
* Given an object and a function that takes a value and returns a predicate, filter out
|
|
19
|
+
* all non-object deeply nested values that do not pass the predicate.
|
|
20
|
+
*
|
|
21
|
+
* Example: filterObject({ a: 2, b: { c: 6 } }, (val) => val > 5) returns { b { c: 6 } }
|
|
22
|
+
*
|
|
23
|
+
* @param {*} obj
|
|
24
|
+
* @param {* => boolean} predicate a function that takes a value and return a boolean,
|
|
25
|
+
* representing if it should be included in the result object or not.
|
|
26
|
+
* @returns A copy of the original object with the values that fail the predicate, filtered out.
|
|
27
|
+
*/
|
|
28
|
+
var filterObject = function filterObject(obj, predicate) {
|
|
29
|
+
if ((0, _isNil.default)(obj) || !(0, _isObject.default)(obj)) {
|
|
30
|
+
return obj;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
return Object.keys(obj).reduce(function (result, key) {
|
|
34
|
+
var value = obj[key];
|
|
35
|
+
|
|
36
|
+
if ((0, _isObject.default)(value)) {
|
|
37
|
+
// value is object, go deeper
|
|
38
|
+
var filteredValue = filterObject(value, predicate);
|
|
39
|
+
|
|
40
|
+
if ((0, _isEmptyObject.default)(filteredValue)) {
|
|
41
|
+
return result;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
return _objectSpread(_objectSpread({}, result), {}, _defineProperty({}, key, filteredValue));
|
|
45
|
+
} // value is not an object, test predicate
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
if (predicate(value)) {
|
|
49
|
+
return _objectSpread(_objectSpread({}, result), {}, _defineProperty({}, key, value));
|
|
50
|
+
}
|
|
51
|
+
|
|
52
|
+
return result;
|
|
53
|
+
}, {});
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
var _default = filterObject;
|
|
57
|
+
exports.default = _default;
|
package/libEs5/utils/index.js
CHANGED
|
@@ -78,6 +78,12 @@ Object.defineProperty(exports, "endsWith", {
|
|
|
78
78
|
return _endsWith.default;
|
|
79
79
|
}
|
|
80
80
|
});
|
|
81
|
+
Object.defineProperty(exports, "filterObject", {
|
|
82
|
+
enumerable: true,
|
|
83
|
+
get: function get() {
|
|
84
|
+
return _filterObject.default;
|
|
85
|
+
}
|
|
86
|
+
});
|
|
81
87
|
Object.defineProperty(exports, "find", {
|
|
82
88
|
enumerable: true,
|
|
83
89
|
get: function get() {
|
|
@@ -234,6 +240,12 @@ Object.defineProperty(exports, "padStart", {
|
|
|
234
240
|
return _padStart.default;
|
|
235
241
|
}
|
|
236
242
|
});
|
|
243
|
+
Object.defineProperty(exports, "prepareConfigOverridesForEdge", {
|
|
244
|
+
enumerable: true,
|
|
245
|
+
get: function get() {
|
|
246
|
+
return _prepareConfigOverridesForEdge.default;
|
|
247
|
+
}
|
|
248
|
+
});
|
|
237
249
|
Object.defineProperty(exports, "queryString", {
|
|
238
250
|
enumerable: true,
|
|
239
251
|
get: function get() {
|
|
@@ -300,6 +312,12 @@ Object.defineProperty(exports, "uuid", {
|
|
|
300
312
|
return _uuid.default;
|
|
301
313
|
}
|
|
302
314
|
});
|
|
315
|
+
Object.defineProperty(exports, "validateConfigOverride", {
|
|
316
|
+
enumerable: true,
|
|
317
|
+
get: function get() {
|
|
318
|
+
return _validateConfigOverride.default;
|
|
319
|
+
}
|
|
320
|
+
});
|
|
303
321
|
Object.defineProperty(exports, "validateIdentityMap", {
|
|
304
322
|
enumerable: true,
|
|
305
323
|
get: function get() {
|
|
@@ -345,6 +363,8 @@ var _fireImage = require("./fireImage");
|
|
|
345
363
|
|
|
346
364
|
var _injectFireReferrerHideableImage = require("./injectFireReferrerHideableImage");
|
|
347
365
|
|
|
366
|
+
var _filterObject = require("./filterObject");
|
|
367
|
+
|
|
348
368
|
var _flatMap = require("./flatMap");
|
|
349
369
|
|
|
350
370
|
var _getApexDomain = require("./getApexDomain");
|
|
@@ -391,6 +411,8 @@ var _noop = require("./noop");
|
|
|
391
411
|
|
|
392
412
|
var _padStart = require("./padStart");
|
|
393
413
|
|
|
414
|
+
var _prepareConfigOverridesForEdge = require("./prepareConfigOverridesForEdge");
|
|
415
|
+
|
|
394
416
|
var _querystring = require("./querystring");
|
|
395
417
|
|
|
396
418
|
var _sanitizeOrgIdForCookieName = require("./sanitizeOrgIdForCookieName");
|
|
@@ -415,4 +437,6 @@ var _updateErrorMessage = require("./updateErrorMessage");
|
|
|
415
437
|
|
|
416
438
|
var _validateIdentityMap = require("./validateIdentityMap");
|
|
417
439
|
|
|
440
|
+
var _validateConfigOverride = require("./validateConfigOverride");
|
|
441
|
+
|
|
418
442
|
var _values = require("./values");
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
exports.default = void 0;
|
|
4
|
+
|
|
5
|
+
var _isNil = require("./isNil");
|
|
6
|
+
|
|
7
|
+
var _filterObject = require("./filterObject");
|
|
8
|
+
|
|
9
|
+
var _isEmptyObject = require("./isEmptyObject");
|
|
10
|
+
|
|
11
|
+
var _isNonEmptyArray = require("./isNonEmptyArray");
|
|
12
|
+
|
|
13
|
+
var _isNonEmptyString = require("./isNonEmptyString");
|
|
14
|
+
|
|
15
|
+
var _isNumber = require("./isNumber");
|
|
16
|
+
|
|
17
|
+
var _isBoolean = require("./isBoolean");
|
|
18
|
+
|
|
19
|
+
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
20
|
+
|
|
21
|
+
// We want to avoid mapping between specific keys because we want Konductor
|
|
22
|
+
// to be able to add overrides in the future without us needing to make
|
|
23
|
+
// any changes to the Web SDK
|
|
24
|
+
var _default = function _default(configuration) {
|
|
25
|
+
if ((0, _isNil.default)(configuration) || _typeof(configuration) !== "object") {
|
|
26
|
+
return null;
|
|
27
|
+
} // remove entries that are empty strings or arrays
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
var configOverrides = (0, _filterObject.default)(configuration, function (value) {
|
|
31
|
+
if ((0, _isNil.default)(value)) {
|
|
32
|
+
return false;
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
if ((0, _isBoolean.default)(value)) {
|
|
36
|
+
return true;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
if ((0, _isNumber.default)(value)) {
|
|
40
|
+
return true;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
if ((0, _isNonEmptyString.default)(value)) {
|
|
44
|
+
return true;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
if ((0, _isNonEmptyArray.default)(value)) {
|
|
48
|
+
return true;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
return false;
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
if ((0, _isEmptyObject.default)(configOverrides)) {
|
|
55
|
+
return null;
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
return configOverrides;
|
|
59
|
+
};
|
|
60
|
+
|
|
61
|
+
exports.default = _default;
|
|
@@ -21,10 +21,16 @@ var _default = function _default(options) {
|
|
|
21
21
|
var content = options.content,
|
|
22
22
|
addIdentity = options.addIdentity,
|
|
23
23
|
hasIdentity = options.hasIdentity;
|
|
24
|
+
|
|
25
|
+
var _mergeConfigOverride = (0, _.createMerger)(content, "meta.configOverrides");
|
|
26
|
+
|
|
24
27
|
return {
|
|
25
28
|
mergeMeta: (0, _.createMerger)(content, "meta"),
|
|
26
29
|
mergeState: (0, _.createMerger)(content, "meta.state"),
|
|
27
30
|
mergeQuery: (0, _.createMerger)(content, "query"),
|
|
31
|
+
mergeConfigOverride: function mergeConfigOverride(updates) {
|
|
32
|
+
return _mergeConfigOverride((0, _.prepareConfigOverridesForEdge)(updates));
|
|
33
|
+
},
|
|
28
34
|
addIdentity: addIdentity,
|
|
29
35
|
hasIdentity: hasIdentity,
|
|
30
36
|
toJSON: function toJSON() {
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
exports.default = void 0;
|
|
4
|
+
|
|
5
|
+
var _validation = require("./validation");
|
|
6
|
+
|
|
7
|
+
/*
|
|
8
|
+
Copyright 2022 Adobe. All rights reserved.
|
|
9
|
+
This file is licensed to you under the Apache License, Version 2.0 (the "License");
|
|
10
|
+
you may not use this file except in compliance with the License. You may obtain a copy
|
|
11
|
+
of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
12
|
+
|
|
13
|
+
Unless required by applicable law or agreed to in writing, software distributed under
|
|
14
|
+
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
|
|
15
|
+
OF ANY KIND, either express or implied. See the License for the specific language
|
|
16
|
+
governing permissions and limitations under the License.
|
|
17
|
+
*/
|
|
18
|
+
var _default = (0, _validation.objectOf)({});
|
|
19
|
+
|
|
20
|
+
exports.default = _default;
|
|
@@ -11,9 +11,11 @@ governing permissions and limitations under the License.
|
|
|
11
11
|
*/
|
|
12
12
|
import validateUserEventOptions from "./validateUserEventOptions";
|
|
13
13
|
import validateApplyResponse from "./validateApplyResponse";
|
|
14
|
+
import { deepAssign } from "../../utils";
|
|
14
15
|
|
|
15
16
|
const createDataCollector = ({
|
|
16
|
-
eventManager
|
|
17
|
+
eventManager,
|
|
18
|
+
logger
|
|
17
19
|
}) => {
|
|
18
20
|
return {
|
|
19
21
|
commands: {
|
|
@@ -35,7 +37,8 @@ const createDataCollector = ({
|
|
|
35
37
|
decisionScopes = [],
|
|
36
38
|
// Note: this option will soon be deprecated, please use personalization.decisionScopes instead
|
|
37
39
|
personalization = {},
|
|
38
|
-
datasetId
|
|
40
|
+
datasetId,
|
|
41
|
+
edgeConfigOverrides
|
|
39
42
|
} = options;
|
|
40
43
|
const event = eventManager.createEvent();
|
|
41
44
|
|
|
@@ -58,19 +61,31 @@ const createDataCollector = ({
|
|
|
58
61
|
});
|
|
59
62
|
}
|
|
60
63
|
|
|
64
|
+
const sendEventOptions = {
|
|
65
|
+
renderDecisions,
|
|
66
|
+
decisionScopes,
|
|
67
|
+
personalization
|
|
68
|
+
};
|
|
69
|
+
|
|
70
|
+
if (edgeConfigOverrides) {
|
|
71
|
+
sendEventOptions.edgeConfigOverrides = edgeConfigOverrides;
|
|
72
|
+
}
|
|
73
|
+
|
|
61
74
|
if (datasetId) {
|
|
62
|
-
event.
|
|
63
|
-
|
|
64
|
-
|
|
75
|
+
logger.warn("The 'datasetId' option has been deprecated. Please use 'edgeConfigOverrides.experience_platform.datasets.event' instead.");
|
|
76
|
+
sendEventOptions.edgeConfigOverrides = edgeConfigOverrides || {};
|
|
77
|
+
deepAssign(sendEventOptions.edgeConfigOverrides, {
|
|
78
|
+
com_adobe_experience_platform: {
|
|
79
|
+
datasets: {
|
|
80
|
+
event: {
|
|
81
|
+
datasetId
|
|
82
|
+
}
|
|
83
|
+
}
|
|
65
84
|
}
|
|
66
85
|
});
|
|
67
86
|
}
|
|
68
87
|
|
|
69
|
-
return eventManager.sendEvent(event,
|
|
70
|
-
renderDecisions,
|
|
71
|
-
decisionScopes,
|
|
72
|
-
personalization
|
|
73
|
-
});
|
|
88
|
+
return eventManager.sendEvent(event, sendEventOptions);
|
|
74
89
|
}
|
|
75
90
|
},
|
|
76
91
|
applyResponse: {
|
|
@@ -10,7 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
|
|
|
10
10
|
governing permissions and limitations under the License.
|
|
11
11
|
*/
|
|
12
12
|
import { string, objectOf, boolean, arrayOf } from "../../utils/validation";
|
|
13
|
-
import { validateIdentityMap } from "../../utils";
|
|
13
|
+
import { validateConfigOverride, validateIdentityMap } from "../../utils";
|
|
14
14
|
/**
|
|
15
15
|
* Verifies user provided event options.
|
|
16
16
|
* @param {*} options The user event options to validate
|
|
@@ -35,7 +35,8 @@ export default (({
|
|
|
35
35
|
surfaces: arrayOf(string()).uniqueItems()
|
|
36
36
|
}),
|
|
37
37
|
datasetId: string(),
|
|
38
|
-
mergeId: string()
|
|
38
|
+
mergeId: string(),
|
|
39
|
+
edgeConfigOverrides: validateConfigOverride
|
|
39
40
|
}).required().noUnknownFields();
|
|
40
41
|
return eventOptionsValidator(options);
|
|
41
42
|
});
|
package/libEs6/components/Identity/appendIdentityToUrl/appendIdentityToUrlOptionsValidator.js
CHANGED
|
@@ -9,6 +9,7 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
|
|
|
9
9
|
OF ANY KIND, either express or implied. See the License for the specific language
|
|
10
10
|
governing permissions and limitations under the License.
|
|
11
11
|
*/
|
|
12
|
+
import { validateConfigOverride } from "../../../utils";
|
|
12
13
|
import { objectOf, string } from "../../../utils/validation";
|
|
13
14
|
/**
|
|
14
15
|
* Verifies user provided event options.
|
|
@@ -17,5 +18,6 @@ import { objectOf, string } from "../../../utils/validation";
|
|
|
17
18
|
*/
|
|
18
19
|
|
|
19
20
|
export default objectOf({
|
|
20
|
-
url: string().required().nonEmpty()
|
|
21
|
+
url: string().required().nonEmpty(),
|
|
22
|
+
edgeConfigOverrides: validateConfigOverride
|
|
21
23
|
}).required().noUnknownFields();
|
|
@@ -57,7 +57,7 @@ export default (({
|
|
|
57
57
|
optionsValidator: getIdentityOptionsValidator,
|
|
58
58
|
run: options => {
|
|
59
59
|
return consent.awaitConsent().then(() => {
|
|
60
|
-
return ecid ? undefined : getIdentity(options
|
|
60
|
+
return ecid ? undefined : getIdentity(options);
|
|
61
61
|
}).then(() => {
|
|
62
62
|
return {
|
|
63
63
|
identity: {
|
|
@@ -72,7 +72,7 @@ export default (({
|
|
|
72
72
|
optionsValidator: appendIdentityToUrlOptionsValidator,
|
|
73
73
|
run: options => {
|
|
74
74
|
return consent.withConsent().then(() => {
|
|
75
|
-
return ecid ? undefined : getIdentity(options
|
|
75
|
+
return ecid ? undefined : getIdentity(options);
|
|
76
76
|
}).then(() => {
|
|
77
77
|
return {
|
|
78
78
|
url: appendIdentityToUrl(ecid, options.url)
|
|
@@ -12,11 +12,18 @@ governing permissions and limitations under the License.
|
|
|
12
12
|
export default (({
|
|
13
13
|
sendEdgeNetworkRequest,
|
|
14
14
|
createIdentityRequestPayload,
|
|
15
|
-
createIdentityRequest
|
|
15
|
+
createIdentityRequest,
|
|
16
|
+
globalConfigOverrides
|
|
16
17
|
}) => {
|
|
17
|
-
return
|
|
18
|
+
return ({
|
|
19
|
+
namespaces,
|
|
20
|
+
edgeConfigOverrides: localConfigOverrides
|
|
21
|
+
} = {}) => {
|
|
18
22
|
const payload = createIdentityRequestPayload(namespaces);
|
|
19
|
-
const request = createIdentityRequest(payload);
|
|
23
|
+
const request = createIdentityRequest(payload); // merge the configurations, but give preference to the command-local configs
|
|
24
|
+
|
|
25
|
+
payload.mergeConfigOverride(globalConfigOverrides);
|
|
26
|
+
payload.mergeConfigOverride(localConfigOverrides);
|
|
20
27
|
return sendEdgeNetworkRequest({
|
|
21
28
|
request
|
|
22
29
|
});
|
|
@@ -9,6 +9,7 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
|
|
|
9
9
|
OF ANY KIND, either express or implied. See the License for the specific language
|
|
10
10
|
governing permissions and limitations under the License.
|
|
11
11
|
*/
|
|
12
|
+
import { validateConfigOverride } from "../../../utils";
|
|
12
13
|
import { objectOf, literal, arrayOf } from "../../../utils/validation";
|
|
13
14
|
/**
|
|
14
15
|
* Verifies user provided event options.
|
|
@@ -16,14 +17,9 @@ import { objectOf, literal, arrayOf } from "../../../utils/validation";
|
|
|
16
17
|
* @returns {*} Validated options
|
|
17
18
|
*/
|
|
18
19
|
|
|
19
|
-
export default (
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
// To-Do: Accept namespace from given options
|
|
25
|
-
|
|
26
|
-
return {
|
|
27
|
-
namespaces: ["ECID"]
|
|
28
|
-
};
|
|
20
|
+
export default objectOf({
|
|
21
|
+
namespaces: arrayOf(literal("ECID")).nonEmpty().uniqueItems().default(["ECID"]),
|
|
22
|
+
edgeConfigOverrides: validateConfigOverride
|
|
23
|
+
}).noUnknownFields().default({
|
|
24
|
+
namespaces: ["ECID"]
|
|
29
25
|
});
|
|
@@ -40,7 +40,8 @@ const createIdentity = ({
|
|
|
40
40
|
}) => {
|
|
41
41
|
const {
|
|
42
42
|
orgId,
|
|
43
|
-
thirdPartyCookiesEnabled
|
|
43
|
+
thirdPartyCookiesEnabled,
|
|
44
|
+
edgeConfigOverrides: globalConfigOverrides
|
|
44
45
|
} = config;
|
|
45
46
|
const getEcidFromVisitor = injectGetEcidFromVisitor({
|
|
46
47
|
logger,
|
|
@@ -64,7 +65,8 @@ const createIdentity = ({
|
|
|
64
65
|
const getIdentity = createGetIdentity({
|
|
65
66
|
sendEdgeNetworkRequest,
|
|
66
67
|
createIdentityRequestPayload,
|
|
67
|
-
createIdentityRequest
|
|
68
|
+
createIdentityRequest,
|
|
69
|
+
globalConfigOverrides
|
|
68
70
|
});
|
|
69
71
|
const setDomainForInitialIdentityPayload = injectSetDomainForInitialIdentityPayload({
|
|
70
72
|
thirdPartyCookiesEnabled,
|
|
@@ -100,7 +102,8 @@ const createIdentity = ({
|
|
|
100
102
|
});
|
|
101
103
|
const appendIdentityToUrl = injectAppendIdentityToUrl({
|
|
102
104
|
dateProvider: () => new Date(),
|
|
103
|
-
orgId
|
|
105
|
+
orgId,
|
|
106
|
+
globalConfigOverrides
|
|
104
107
|
});
|
|
105
108
|
return createComponent({
|
|
106
109
|
addEcidQueryToPayload,
|
|
@@ -112,7 +115,8 @@ const createIdentity = ({
|
|
|
112
115
|
getIdentity,
|
|
113
116
|
consent,
|
|
114
117
|
appendIdentityToUrl,
|
|
115
|
-
logger
|
|
118
|
+
logger,
|
|
119
|
+
config
|
|
116
120
|
});
|
|
117
121
|
};
|
|
118
122
|
|
|
@@ -57,7 +57,8 @@ export default (({
|
|
|
57
57
|
optionsValidator: validateSetConsentOptions,
|
|
58
58
|
run: ({
|
|
59
59
|
consent: consentOptions,
|
|
60
|
-
identityMap
|
|
60
|
+
identityMap,
|
|
61
|
+
edgeConfigOverrides
|
|
61
62
|
}) => {
|
|
62
63
|
consent.suspend();
|
|
63
64
|
const consentHashes = consentHashStore.lookup(consentOptions);
|
|
@@ -65,7 +66,8 @@ export default (({
|
|
|
65
66
|
if (consentHashes.isNew()) {
|
|
66
67
|
return sendSetConsentRequest({
|
|
67
68
|
consentOptions,
|
|
68
|
-
identityMap
|
|
69
|
+
identityMap,
|
|
70
|
+
edgeConfigOverrides
|
|
69
71
|
});
|
|
70
72
|
}
|
|
71
73
|
|
|
@@ -38,7 +38,8 @@ const createPrivacy = ({
|
|
|
38
38
|
const sendSetConsentRequest = injectSendSetConsentRequest({
|
|
39
39
|
createConsentRequestPayload,
|
|
40
40
|
createConsentRequest,
|
|
41
|
-
sendEdgeNetworkRequest
|
|
41
|
+
sendEdgeNetworkRequest,
|
|
42
|
+
edgeConfigOverrides: config.edgeConfigOverrides
|
|
42
43
|
});
|
|
43
44
|
const storage = createNamespacedStorage(`${sanitizeOrgIdForCookieName(orgId)}.consentHashes.`);
|
|
44
45
|
const consentHashStore = createConsentHashStore({
|
|
@@ -13,13 +13,17 @@ import { isObject } from "../../utils";
|
|
|
13
13
|
export default (({
|
|
14
14
|
createConsentRequestPayload,
|
|
15
15
|
createConsentRequest,
|
|
16
|
-
sendEdgeNetworkRequest
|
|
16
|
+
sendEdgeNetworkRequest,
|
|
17
|
+
edgeConfigOverrides: globalConfigOverrides
|
|
17
18
|
}) => ({
|
|
18
19
|
consentOptions,
|
|
19
|
-
identityMap
|
|
20
|
+
identityMap,
|
|
21
|
+
edgeConfigOverrides: localConfigOverrides
|
|
20
22
|
}) => {
|
|
21
23
|
const payload = createConsentRequestPayload();
|
|
22
24
|
payload.setConsent(consentOptions);
|
|
25
|
+
payload.mergeConfigOverride(globalConfigOverrides);
|
|
26
|
+
payload.mergeConfigOverride(localConfigOverrides);
|
|
23
27
|
|
|
24
28
|
if (isObject(identityMap)) {
|
|
25
29
|
Object.keys(identityMap).forEach(key => {
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { objectOf, anything, arrayOf } from "../../utils/validation";
|
|
2
|
-
import { validateIdentityMap } from "../../utils";
|
|
2
|
+
import { validateIdentityMap, validateConfigOverride } from "../../utils";
|
|
3
3
|
export default objectOf({
|
|
4
4
|
consent: arrayOf(anything()).required().nonEmpty(),
|
|
5
|
-
identityMap: validateIdentityMap
|
|
5
|
+
identityMap: validateIdentityMap,
|
|
6
|
+
edgeConfigOverrides: validateConfigOverride
|
|
6
7
|
}).noUnknownFields().required();
|
|
@@ -10,7 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
|
|
|
10
10
|
governing permissions and limitations under the License.
|
|
11
11
|
*/
|
|
12
12
|
import { boolean, string, callback, enumOf } from "../../utils/validation";
|
|
13
|
-
import { noop } from "../../utils";
|
|
13
|
+
import { noop, validateConfigOverride } from "../../utils";
|
|
14
14
|
import { EDGE as EDGE_DOMAIN } from "../../constants/domain";
|
|
15
15
|
import EDGE_BASE_PATH from "../../constants/edgeBasePath";
|
|
16
16
|
import { IN, OUT, PENDING } from "../../constants/consentStatus";
|
|
@@ -21,5 +21,6 @@ export default (() => ({
|
|
|
21
21
|
edgeDomain: string().domain().default(EDGE_DOMAIN),
|
|
22
22
|
edgeBasePath: string().nonEmpty().default(EDGE_BASE_PATH),
|
|
23
23
|
orgId: string().unique().required(),
|
|
24
|
-
onBeforeEventSend: callback().default(noop)
|
|
24
|
+
onBeforeEventSend: callback().default(noop),
|
|
25
|
+
edgeConfigOverrides: validateConfigOverride
|
|
25
26
|
}));
|
|
@@ -24,7 +24,8 @@ export default (({
|
|
|
24
24
|
applyResponse
|
|
25
25
|
}) => {
|
|
26
26
|
const {
|
|
27
|
-
onBeforeEventSend
|
|
27
|
+
onBeforeEventSend,
|
|
28
|
+
edgeConfigOverrides: globalConfigOverrides
|
|
28
29
|
} = config;
|
|
29
30
|
return {
|
|
30
31
|
createEvent,
|
|
@@ -49,12 +50,15 @@ export default (({
|
|
|
49
50
|
const {
|
|
50
51
|
renderDecisions = false,
|
|
51
52
|
decisionScopes,
|
|
53
|
+
edgeConfigOverrides: localConfigOverrides,
|
|
52
54
|
personalization
|
|
53
55
|
} = options;
|
|
54
56
|
const payload = createDataCollectionRequestPayload();
|
|
55
57
|
const request = createDataCollectionRequest(payload);
|
|
56
58
|
const onResponseCallbackAggregator = createCallbackAggregator();
|
|
57
59
|
const onRequestFailureCallbackAggregator = createCallbackAggregator();
|
|
60
|
+
payload.mergeConfigOverride(globalConfigOverrides);
|
|
61
|
+
payload.mergeConfigOverride(localConfigOverrides);
|
|
58
62
|
return lifecycle.onBeforeEvent({
|
|
59
63
|
event,
|
|
60
64
|
renderDecisions,
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
/*
|
|
2
|
+
Copyright 2022 Adobe. All rights reserved.
|
|
3
|
+
This file is licensed to you under the Apache License, Version 2.0 (the "License");
|
|
4
|
+
you may not use this file except in compliance with the License. You may obtain a copy
|
|
5
|
+
of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
6
|
+
|
|
7
|
+
Unless required by applicable law or agreed to in writing, software distributed under
|
|
8
|
+
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
|
|
9
|
+
OF ANY KIND, either express or implied. See the License for the specific language
|
|
10
|
+
governing permissions and limitations under the License.
|
|
11
|
+
*/
|
|
12
|
+
import isEmptyObject from "./isEmptyObject";
|
|
13
|
+
import isNil from "./isNil";
|
|
14
|
+
import isObject from "./isObject";
|
|
15
|
+
/**
|
|
16
|
+
* Given an object and a function that takes a value and returns a predicate, filter out
|
|
17
|
+
* all non-object deeply nested values that do not pass the predicate.
|
|
18
|
+
*
|
|
19
|
+
* Example: filterObject({ a: 2, b: { c: 6 } }, (val) => val > 5) returns { b { c: 6 } }
|
|
20
|
+
*
|
|
21
|
+
* @param {*} obj
|
|
22
|
+
* @param {* => boolean} predicate a function that takes a value and return a boolean,
|
|
23
|
+
* representing if it should be included in the result object or not.
|
|
24
|
+
* @returns A copy of the original object with the values that fail the predicate, filtered out.
|
|
25
|
+
*/
|
|
26
|
+
|
|
27
|
+
const filterObject = (obj, predicate) => {
|
|
28
|
+
if (isNil(obj) || !isObject(obj)) {
|
|
29
|
+
return obj;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
return Object.keys(obj).reduce((result, key) => {
|
|
33
|
+
const value = obj[key];
|
|
34
|
+
|
|
35
|
+
if (isObject(value)) {
|
|
36
|
+
// value is object, go deeper
|
|
37
|
+
const filteredValue = filterObject(value, predicate);
|
|
38
|
+
|
|
39
|
+
if (isEmptyObject(filteredValue)) {
|
|
40
|
+
return result;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
return { ...result,
|
|
44
|
+
[key]: filteredValue
|
|
45
|
+
};
|
|
46
|
+
} // value is not an object, test predicate
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
if (predicate(value)) {
|
|
50
|
+
return { ...result,
|
|
51
|
+
[key]: value
|
|
52
|
+
};
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
return result;
|
|
56
|
+
}, {});
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
export default filterObject;
|
package/libEs6/utils/index.js
CHANGED
|
@@ -26,6 +26,7 @@ export { default as endsWith } from "./endsWith";
|
|
|
26
26
|
export { default as find } from "./find";
|
|
27
27
|
export { default as fireImage } from "./fireImage";
|
|
28
28
|
export { default as injectFireReferrerHideableImage } from "./injectFireReferrerHideableImage";
|
|
29
|
+
export { default as filterObject } from "./filterObject";
|
|
29
30
|
export { default as flatMap } from "./flatMap";
|
|
30
31
|
export { default as getApexDomain } from "./getApexDomain";
|
|
31
32
|
export { default as getLastArrayItems } from "./getLastArrayItems";
|
|
@@ -49,6 +50,7 @@ export { default as isString } from "./isString";
|
|
|
49
50
|
export { default as memoize } from "./memoize";
|
|
50
51
|
export { default as noop } from "./noop";
|
|
51
52
|
export { default as padStart } from "./padStart";
|
|
53
|
+
export { default as prepareConfigOverridesForEdge } from "./prepareConfigOverridesForEdge";
|
|
52
54
|
export { default as queryString } from "./querystring";
|
|
53
55
|
export { default as sanitizeOrgIdForCookieName } from "./sanitizeOrgIdForCookieName";
|
|
54
56
|
export { default as stackError } from "./stackError";
|
|
@@ -61,4 +63,5 @@ export { default as toISOStringLocal } from "./toISOStringLocal";
|
|
|
61
63
|
export { default as uuid } from "./uuid";
|
|
62
64
|
export { default as updateErrorMessage } from "./updateErrorMessage";
|
|
63
65
|
export { default as validateIdentityMap } from "./validateIdentityMap";
|
|
66
|
+
export { default as validateConfigOverride } from "./validateConfigOverride";
|
|
64
67
|
export { default as values } from "./values";
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
/*
|
|
2
|
+
Copyright 2022 Adobe. All rights reserved.
|
|
3
|
+
This file is licensed to you under the Apache License, Version 2.0 (the "License");
|
|
4
|
+
you may not use this file except in compliance with the License. You may obtain a copy
|
|
5
|
+
of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
6
|
+
|
|
7
|
+
Unless required by applicable law or agreed to in writing, software distributed under
|
|
8
|
+
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
|
|
9
|
+
OF ANY KIND, either express or implied. See the License for the specific language
|
|
10
|
+
governing permissions and limitations under the License.
|
|
11
|
+
*/
|
|
12
|
+
import isNil from "./isNil";
|
|
13
|
+
import filterObject from "./filterObject";
|
|
14
|
+
import isEmptyObject from "./isEmptyObject";
|
|
15
|
+
import isNonEmptyArray from "./isNonEmptyArray";
|
|
16
|
+
import isNonEmptyString from "./isNonEmptyString";
|
|
17
|
+
import isNumber from "./isNumber";
|
|
18
|
+
import isBoolean from "./isBoolean"; // We want to avoid mapping between specific keys because we want Konductor
|
|
19
|
+
// to be able to add overrides in the future without us needing to make
|
|
20
|
+
// any changes to the Web SDK
|
|
21
|
+
|
|
22
|
+
export default (configuration => {
|
|
23
|
+
if (isNil(configuration) || typeof configuration !== "object") {
|
|
24
|
+
return null;
|
|
25
|
+
} // remove entries that are empty strings or arrays
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
const configOverrides = filterObject(configuration, value => {
|
|
29
|
+
if (isNil(value)) {
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
if (isBoolean(value)) {
|
|
34
|
+
return true;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
if (isNumber(value)) {
|
|
38
|
+
return true;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
if (isNonEmptyString(value)) {
|
|
42
|
+
return true;
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
if (isNonEmptyArray(value)) {
|
|
46
|
+
return true;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
return false;
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
if (isEmptyObject(configOverrides)) {
|
|
53
|
+
return null;
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
return configOverrides;
|
|
57
|
+
});
|
|
@@ -9,7 +9,7 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
|
|
|
9
9
|
OF ANY KIND, either express or implied. See the License for the specific language
|
|
10
10
|
governing permissions and limitations under the License.
|
|
11
11
|
*/
|
|
12
|
-
import { createMerger } from ".."; // This provides the base functionality that all types of
|
|
12
|
+
import { createMerger, prepareConfigOverridesForEdge } from ".."; // This provides the base functionality that all types of
|
|
13
13
|
// request payloads share.
|
|
14
14
|
|
|
15
15
|
export default (options => {
|
|
@@ -18,10 +18,12 @@ export default (options => {
|
|
|
18
18
|
addIdentity,
|
|
19
19
|
hasIdentity
|
|
20
20
|
} = options;
|
|
21
|
+
const mergeConfigOverride = createMerger(content, "meta.configOverrides");
|
|
21
22
|
return {
|
|
22
23
|
mergeMeta: createMerger(content, "meta"),
|
|
23
24
|
mergeState: createMerger(content, "meta.state"),
|
|
24
25
|
mergeQuery: createMerger(content, "query"),
|
|
26
|
+
mergeConfigOverride: updates => mergeConfigOverride(prepareConfigOverridesForEdge(updates)),
|
|
25
27
|
addIdentity,
|
|
26
28
|
hasIdentity,
|
|
27
29
|
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/*
|
|
2
|
+
Copyright 2022 Adobe. All rights reserved.
|
|
3
|
+
This file is licensed to you under the Apache License, Version 2.0 (the "License");
|
|
4
|
+
you may not use this file except in compliance with the License. You may obtain a copy
|
|
5
|
+
of the License at http://www.apache.org/licenses/LICENSE-2.0
|
|
6
|
+
|
|
7
|
+
Unless required by applicable law or agreed to in writing, software distributed under
|
|
8
|
+
the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
|
|
9
|
+
OF ANY KIND, either express or implied. See the License for the specific language
|
|
10
|
+
governing permissions and limitations under the License.
|
|
11
|
+
*/
|
|
12
|
+
import { objectOf } from "./validation";
|
|
13
|
+
export default objectOf({});
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@adobe/alloy",
|
|
3
|
-
"version": "2.14.0-alpha.
|
|
3
|
+
"version": "2.14.0-alpha.5",
|
|
4
4
|
"description": "Adobe Experience Platform Web SDK",
|
|
5
5
|
"main": "libEs5/index.js",
|
|
6
6
|
"module": "libEs6/index.js",
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"uuid": "^3.3.2"
|
|
65
65
|
},
|
|
66
66
|
"devDependencies": {
|
|
67
|
-
"@adobe/alloy": "^2.14.0-alpha.
|
|
67
|
+
"@adobe/alloy": "^2.14.0-alpha.4",
|
|
68
68
|
"@babel/cli": "^7.12.8",
|
|
69
69
|
"@babel/core": "^7.2.2",
|
|
70
70
|
"@babel/plugin-proposal-object-rest-spread": "^7.3.2",
|