@adobe/alloy 2.14.0-alpha.2 → 2.14.0-alpha.4

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.
Files changed (47) hide show
  1. package/libEs5/components/DataCollector/index.js +26 -10
  2. package/libEs5/components/DataCollector/validateUserEventOptions.js +2 -1
  3. package/libEs5/components/Identity/appendIdentityToUrl/appendIdentityToUrlOptionsValidator.js +4 -1
  4. package/libEs5/components/Identity/createComponent.js +2 -2
  5. package/libEs5/components/Identity/getIdentity/createGetIdentity.js +11 -3
  6. package/libEs5/components/Identity/getIdentity/getIdentityOptionsValidator.js +8 -11
  7. package/libEs5/components/Identity/index.js +8 -4
  8. package/libEs5/components/Privacy/createComponent.js +4 -2
  9. package/libEs5/components/Privacy/index.js +2 -1
  10. package/libEs5/components/Privacy/injectSendSetConsentRequest.js +6 -2
  11. package/libEs5/components/Privacy/validateSetConsentOptions.js +2 -1
  12. package/libEs5/constants/libraryVersion.js +1 -1
  13. package/libEs5/core/config/createCoreConfigs.js +2 -1
  14. package/libEs5/core/createEventManager.js +5 -1
  15. package/libEs5/core/edgeNetwork/injectSendEdgeNetworkRequest.js +3 -2
  16. package/libEs5/core/index.js +6 -1
  17. package/libEs5/utils/filterObject.js +57 -0
  18. package/libEs5/utils/index.js +24 -0
  19. package/libEs5/utils/prepareConfigOverridesForEdge.js +61 -0
  20. package/libEs5/utils/request/createGetAssuranceValidationTokenParams.js +54 -0
  21. package/libEs5/utils/request/createRequestPayload.js +6 -0
  22. package/libEs5/utils/request/index.js +9 -1
  23. package/libEs5/utils/validateConfigOverride.js +20 -0
  24. package/libEs6/components/DataCollector/index.js +25 -10
  25. package/libEs6/components/DataCollector/validateUserEventOptions.js +3 -2
  26. package/libEs6/components/Identity/appendIdentityToUrl/appendIdentityToUrlOptionsValidator.js +3 -1
  27. package/libEs6/components/Identity/createComponent.js +2 -2
  28. package/libEs6/components/Identity/getIdentity/createGetIdentity.js +10 -3
  29. package/libEs6/components/Identity/getIdentity/getIdentityOptionsValidator.js +6 -10
  30. package/libEs6/components/Identity/index.js +8 -4
  31. package/libEs6/components/Privacy/createComponent.js +4 -2
  32. package/libEs6/components/Privacy/index.js +2 -1
  33. package/libEs6/components/Privacy/injectSendSetConsentRequest.js +6 -2
  34. package/libEs6/components/Privacy/validateSetConsentOptions.js +3 -2
  35. package/libEs6/constants/libraryVersion.js +1 -1
  36. package/libEs6/core/config/createCoreConfigs.js +3 -2
  37. package/libEs6/core/createEventManager.js +5 -1
  38. package/libEs6/core/edgeNetwork/injectSendEdgeNetworkRequest.js +3 -2
  39. package/libEs6/core/index.js +7 -2
  40. package/libEs6/utils/filterObject.js +59 -0
  41. package/libEs6/utils/index.js +3 -0
  42. package/libEs6/utils/prepareConfigOverridesForEdge.js +57 -0
  43. package/libEs6/utils/request/createGetAssuranceValidationTokenParams.js +47 -0
  44. package/libEs6/utils/request/createRequestPayload.js +3 -1
  45. package/libEs6/utils/request/index.js +2 -1
  46. package/libEs6/utils/validateConfigOverride.js +13 -0
  47. package/package.json +2 -2
@@ -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.mergeMeta({
63
- collect: {
64
- datasetId
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
  });
@@ -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.namespaces);
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.namespaces);
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 namespaces => {
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 (options => {
20
- const getIdentityOptionsValidator = objectOf({
21
- namespaces: arrayOf(literal("ECID")).nonEmpty().uniqueItems()
22
- }).noUnknownFields();
23
- getIdentityOptionsValidator(options); // Return default options for now
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();
@@ -11,4 +11,4 @@ governing permissions and limitations under the License.
11
11
  */
12
12
  // The __VERSION__ keyword will be replace at alloy build time with the package.json version.
13
13
  // see babel-plugin-version
14
- export default "2.14.0-alpha.2";
14
+ export default "2.14.0-alpha.4";
@@ -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,
@@ -21,7 +21,8 @@ export default (({
21
21
  sendNetworkRequest,
22
22
  createResponse,
23
23
  processWarningsAndErrors,
24
- getLocationHint
24
+ getLocationHint,
25
+ getAssuranceValidationTokenParams
25
26
  }) => {
26
27
  const {
27
28
  edgeDomain,
@@ -52,7 +53,7 @@ export default (({
52
53
  const endpointDomain = request.getUseIdThirdPartyDomain() ? ID_THIRD_PARTY_DOMAIN : edgeDomain;
53
54
  const locationHint = getLocationHint();
54
55
  const edgeBasePathWithLocationHint = locationHint ? `${edgeBasePath}/${locationHint}` : edgeBasePath;
55
- const url = `https://${endpointDomain}/${edgeBasePathWithLocationHint}/${apiVersion}/${request.getAction()}?configId=${edgeConfigId}&requestId=${request.getId()}`;
56
+ const url = `https://${endpointDomain}/${edgeBasePathWithLocationHint}/${apiVersion}/${request.getAction()}?configId=${edgeConfigId}&requestId=${request.getId()}${getAssuranceValidationTokenParams()}`;
56
57
  cookieTransfer.cookiesToPayload(request.getPayload(), endpointDomain);
57
58
  return sendNetworkRequest({
58
59
  requestId: request.getId(),
@@ -35,7 +35,7 @@ import createLogger from "./createLogger";
35
35
  import createEventManager from "./createEventManager";
36
36
  import createCookieTransfer from "./createCookieTransfer";
37
37
  import injectShouldTransferCookie from "./injectShouldTransferCookie";
38
- import { createDataCollectionRequest, createDataCollectionRequestPayload } from "../utils/request";
38
+ import { createDataCollectionRequest, createDataCollectionRequestPayload, createGetAssuranceValidationTokenParams } from "../utils/request";
39
39
  import injectSendEdgeNetworkRequest from "./edgeNetwork/injectSendEdgeNetworkRequest";
40
40
  import injectProcessWarningsAndErrors from "./edgeNetwork/injectProcessWarningsAndErrors";
41
41
  import injectGetLocationHint from "./edgeNetwork/injectGetLocationHint";
@@ -61,6 +61,10 @@ const sendFetchRequest = isFunction(fetch) ? injectSendFetchRequest({
61
61
  XMLHttpRequest
62
62
  });
63
63
  const fireReferrerHideableImage = injectFireReferrerHideableImage();
64
+ const getAssuranceValidationTokenParams = createGetAssuranceValidationTokenParams({
65
+ window,
66
+ createNamespacedStorage
67
+ });
64
68
  export const createExecuteCommand = ({
65
69
  instanceName,
66
70
  logController: {
@@ -140,7 +144,8 @@ export const createExecuteCommand = ({
140
144
  sendNetworkRequest,
141
145
  createResponse,
142
146
  processWarningsAndErrors,
143
- getLocationHint
147
+ getLocationHint,
148
+ getAssuranceValidationTokenParams
144
149
  });
145
150
  const applyResponse = injectApplyResponse({
146
151
  lifecycle,
@@ -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;
@@ -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
+ });
@@ -0,0 +1,47 @@
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 { uuid, queryString } from "../index";
13
+ const ASSURANCE_VALIDATION_SESSION_URL_PARAM = "adb_validation_sessionid";
14
+ const ASSURANCE_VALIDATION_NAMESPACE = "validation.";
15
+ const CLIENT_ID = "clientId";
16
+
17
+ const getOrCreateAssuranceClientId = storage => {
18
+ let clientId = storage.persistent.getItem(CLIENT_ID);
19
+
20
+ if (!clientId) {
21
+ clientId = uuid();
22
+ storage.persistent.setItem(CLIENT_ID, clientId);
23
+ }
24
+
25
+ return clientId;
26
+ };
27
+
28
+ export default (({
29
+ window,
30
+ createNamespacedStorage
31
+ }) => {
32
+ const storage = createNamespacedStorage(ASSURANCE_VALIDATION_NAMESPACE);
33
+ return () => {
34
+ const parsedQuery = queryString.parse(window.location.search);
35
+ const validationSessionId = parsedQuery[ASSURANCE_VALIDATION_SESSION_URL_PARAM];
36
+
37
+ if (!validationSessionId) {
38
+ return "";
39
+ }
40
+
41
+ const clientId = getOrCreateAssuranceClientId(storage);
42
+ const validationToken = `${validationSessionId}|${clientId}`;
43
+ return `&${queryString.stringify({
44
+ adobeAepValidationToken: validationToken
45
+ })}`;
46
+ };
47
+ });
@@ -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
 
@@ -14,4 +14,5 @@ export { default as createDataCollectionRequest } from "./createDataCollectionRe
14
14
  export { default as createDataCollectionRequestPayload } from "./createDataCollectionRequestPayload";
15
15
  export { default as createHasIdentity } from "./createHasIdentity";
16
16
  export { default as createRequest } from "./createRequest";
17
- export { default as createRequestPayload } from "./createRequestPayload";
17
+ export { default as createRequestPayload } from "./createRequestPayload";
18
+ export { default as createGetAssuranceValidationTokenParams } from "./createGetAssuranceValidationTokenParams";
@@ -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.2",
3
+ "version": "2.14.0-alpha.4",
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.1",
67
+ "@adobe/alloy": "^2.14.0-alpha.3",
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",