@adobe/alloy 2.10.1-beta.0 → 2.11.0-alpha.1

package/libEs5/components/Identity/appendIdentityToUrl/appendIdentityToUrlOptionsValidator.js

@@ -0,0 +1,28 @@
+"use strict";
+
+exports.default = void 0;
+
+var _validation = require("../../../utils/validation");
+
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+
+/**
+ * Verifies user provided event options.
+ * @param {*} options The user event options to validate
+ * @returns {*} Validated options
+ */
+var _default = (0, _validation.objectOf)({
+  url: (0, _validation.string)().required().nonEmpty()
+}).required().noUnknownFields();
+
+exports.default = _default;

package/libEs5/components/Identity/appendIdentityToUrl/injectAppendIdentityToUrl.js

@@ -0,0 +1,60 @@
+"use strict";
+
+exports.default = void 0;
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+var URL_REGEX = /^([^?#]*)(\??[^#]*)(#?.*)$/;
+
+var getSeparator = function getSeparator(queryString) {
+  if (queryString === "") {
+    return "?";
+  }
+
+  if (queryString === "?") {
+    return "";
+  }
+
+  return "&";
+};
+
+var _default = function _default(_ref) {
+  var dateProvider = _ref.dateProvider,
+      orgId = _ref.orgId;
+  return function (ecid, url) {
+    var ts = Math.round(dateProvider().getTime() / 1000);
+    var adobemc = encodeURIComponent("TS=" + ts + "|MCMID=" + ecid + "|MCORGID=" + orgId);
+
+    var _url$match = url.match(URL_REGEX),
+        _url$match2 = _slicedToArray(_url$match, 4),
+        location = _url$match2[1],
+        queryString = _url$match2[2],
+        fragment = _url$match2[3];
+
+    var separator = getSeparator(queryString);
+    return "" + location + queryString + separator + "adobe_mc=" + adobemc + fragment;
+  };
+};
+
+exports.default = _default;

package/libEs5/components/Identity/configValidators.js

@@ -17,7 +17,8 @@ governing permissions and limitations under the License.
 */
 var configValidators = {
   thirdPartyCookiesEnabled: (0, _validation.boolean)().default(true),
-  idMigrationEnabled: (0, _validation.boolean)().default(true)
+  idMigrationEnabled: (0, _validation.boolean)().default(true),
+  idOverwriteEnabled: (0, _validation.boolean)().default(false)
 };
 var _default = configValidators;
 exports.default = _default;

package/libEs5/components/Identity/createComponent.js

@@ -6,14 +6,19 @@ var _utils = require("../../utils");
 
 var _getIdentityOptionsValidator = require("./getIdentity/getIdentityOptionsValidator");
 
+var _appendIdentityToUrlOptionsValidator = require("./appendIdentityToUrl/appendIdentityToUrlOptionsValidator");
+
 var _default = function _default(_ref) {
   var addEcidQueryToPayload = _ref.addEcidQueryToPayload,
+      addQueryStringIdentityToPayload = _ref.addQueryStringIdentityToPayload,
       ensureSingleIdentity = _ref.ensureSingleIdentity,
       setLegacyEcid = _ref.setLegacyEcid,
       handleResponseForIdSyncs = _ref.handleResponseForIdSyncs,
       getEcidFromResponse = _ref.getEcidFromResponse,
       getIdentity = _ref.getIdentity,
-      consent = _ref.consent;
+      consent = _ref.consent,
+      appendIdentityToUrl = _ref.appendIdentityToUrl,
+      logger = _ref.logger;
   var ecid;
   var edge = {};
   return {
@@ -25,6 +30,7 @@ var _default = function _default(_ref) {
         // Querying the ECID on every request to be able to set the legacy cookie, and make it
         // available for the `getIdentity` command.
         addEcidQueryToPayload(request.getPayload());
+        addQueryStringIdentityToPayload(request.getPayload());
         return ensureSingleIdentity({
           request: request,
           onResponse: onResponse,
@@ -64,6 +70,21 @@ var _default = function _default(_ref) {
             };
           });
         }
+      },
+      appendIdentityToUrl: {
+        optionsValidator: _appendIdentityToUrlOptionsValidator.default,
+        run: function run(options) {
+          return consent.withConsent().then(function () {
+            return ecid ? undefined : getIdentity(options.namespaces);
+          }).then(function () {
+            return {
+              url: appendIdentityToUrl(ecid, options.url)
+            };
+          }).catch(function (error) {
+            logger.warn("Unable to append identity to url. " + error.message);
+            return options;
+          });
+        }
       }
     }
   };

package/libEs5/components/Identity/createLegacyIdentity.js

@@ -63,7 +63,7 @@ var _default = function _default(_ref) {
       return Promise.resolve();
     },
     setEcid: function setEcid(ecid) {
-      if (idMigrationEnabled && !_utils.cookieJar.get(amcvCookieName)) {
+      if (idMigrationEnabled && getEcidFromLegacyCookies() !== ecid) {
         _utils.cookieJar.set(amcvCookieName, "MCMID|" + ecid, {
           domain: apexDomain,
           // Without `expires` this will be a session cookie.

package/libEs5/components/Identity/getIdentity/createIdentityRequestPayload.js

@@ -25,7 +25,8 @@ var _default = function _default(namespaces) {
   };
   return (0, _request.createRequestPayload)({
     content: content,
-    addIdentity: (0, _request.createAddIdentity)(content)
+    addIdentity: (0, _request.createAddIdentity)(content),
+    hasIdentity: (0, _request.createHasIdentity)(content)
   });
 };
 

package/libEs5/components/Identity/index.js

@@ -26,6 +26,8 @@ var _injectSetDomainForInitialIdentityPayload = require("./injectSetDomainForIni
 
 var _injectAddLegacyEcidToPayload = require("./injectAddLegacyEcidToPayload");
 
+var _injectAddQueryStringIdentityToPayload = require("./injectAddQueryStringIdentityToPayload");
+
 var _addEcidToPayload = require("./addEcidToPayload");
 
 var _injectAwaitIdentityCookie = require("./injectAwaitIdentityCookie");
@@ -38,6 +40,8 @@ var _createIdentityRequest = require("./getIdentity/createIdentityRequest");
 
 var _createIdentityRequestPayload = require("./getIdentity/createIdentityRequestPayload");
 
+var _injectAppendIdentityToUrl = require("./appendIdentityToUrl/injectAppendIdentityToUrl");
+
 /*
 Copyright 2019 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -56,7 +60,8 @@ var createIdentity = function createIdentity(_ref) {
       fireReferrerHideableImage = _ref.fireReferrerHideableImage,
       sendEdgeNetworkRequest = _ref.sendEdgeNetworkRequest;
   var orgId = config.orgId,
-      thirdPartyCookiesEnabled = config.thirdPartyCookiesEnabled;
+      thirdPartyCookiesEnabled = config.thirdPartyCookiesEnabled,
+      idOverwriteEnabled = config.idOverwriteEnabled;
   var getEcidFromVisitor = (0, _injectGetEcidFromVisitor.default)({
     logger: logger,
     orgId: orgId,
@@ -82,6 +87,15 @@ var createIdentity = function createIdentity(_ref) {
     getLegacyEcid: legacyIdentity.getEcid,
     addEcidToPayload: _addEcidToPayload.default
   });
+  var addQueryStringIdentityToPayload = (0, _injectAddQueryStringIdentityToPayload.default)({
+    locationSearch: window.document.location.search,
+    dateProvider: function dateProvider() {
+      return new Date();
+    },
+    orgId: orgId,
+    logger: logger,
+    idOverwriteEnabled: idOverwriteEnabled
+  });
   var awaitIdentityCookie = (0, _injectAwaitIdentityCookie.default)({
     doesIdentityCookieExist: doesIdentityCookieExist,
     orgId: orgId
@@ -100,14 +114,23 @@ var createIdentity = function createIdentity(_ref) {
   var handleResponseForIdSyncs = (0, _injectHandleResponseForIdSyncs.default)({
     processIdSyncs: processIdSyncs
   });
+  var appendIdentityToUrl = (0, _injectAppendIdentityToUrl.default)({
+    dateProvider: function dateProvider() {
+      return new Date();
+    },
+    orgId: orgId
+  });
   return (0, _createComponent.default)({
-    ensureSingleIdentity: ensureSingleIdentity,
     addEcidQueryToPayload: _addEcidQueryToPayload.default,
+    addQueryStringIdentityToPayload: addQueryStringIdentityToPayload,
+    ensureSingleIdentity: ensureSingleIdentity,
     setLegacyEcid: legacyIdentity.setEcid,
     handleResponseForIdSyncs: handleResponseForIdSyncs,
     getEcidFromResponse: _getEcidFromResponse.default,
     getIdentity: getIdentity,
-    consent: consent
+    consent: consent,
+    appendIdentityToUrl: appendIdentityToUrl,
+    logger: logger
   });
 };
 

package/libEs5/components/Identity/injectAddLegacyEcidToPayload.js

@@ -2,6 +2,8 @@
 
 exports.default = void 0;
 
+var _ecidNamespace = require("../../constants/ecidNamespace");
+
 /*
 Copyright 2020 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -17,6 +19,12 @@ var _default = function _default(_ref) {
   var getLegacyEcid = _ref.getLegacyEcid,
       addEcidToPayload = _ref.addEcidToPayload;
   return function (payload) {
+    if (payload.hasIdentity(_ecidNamespace.default)) {
+      // don't get the legacy identity if we already have the query string identity or if
+      // the user specified it in the identity map
+      return Promise.resolve();
+    }
+
     return getLegacyEcid().then(function (ecidToMigrate) {
       if (ecidToMigrate) {
         addEcidToPayload(payload, ecidToMigrate);

package/libEs5/components/Identity/injectAddQueryStringIdentityToPayload.js

@@ -0,0 +1,80 @@
+"use strict";
+
+exports.default = void 0;
+
+var _utils = require("../../utils");
+
+var _queryStringIdentityParam = require("../../constants/queryStringIdentityParam");
+
+var _ecidNamespace = require("../../constants/ecidNamespace");
+
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
+var LINK_TTL_SECONDS = 300; // 5 minute link time to live
+
+var _default = function _default(_ref) {
+  var locationSearch = _ref.locationSearch,
+      dateProvider = _ref.dateProvider,
+      orgId = _ref.orgId,
+      logger = _ref.logger,
+      idOverwriteEnabled = _ref.idOverwriteEnabled;
+  return function (payload) {
+    if (payload.hasIdentity(_ecidNamespace.default)) {
+      // don't overwrite a user provided ecid identity
+      return;
+    }
+
+    var parsedQueryString = _utils.queryString.parse(locationSearch);
+
+    var queryStringValue = parsedQueryString[_queryStringIdentityParam.default];
+
+    if (queryStringValue === undefined) {
+      return;
+    }
+
+    var properties = queryStringValue.split("|").reduce(function (memo, keyValue) {
+      var _keyValue$split = keyValue.split("="),
+          _keyValue$split2 = _slicedToArray(_keyValue$split, 2),
+          key = _keyValue$split2[0],
+          value = _keyValue$split2[1];
+
+      memo[key] = value;
+      return memo;
+    }, {}); // We are using MCMID and MCORGID to be compatible with Visitor.
+
+    var ts = parseInt(properties.TS, 10);
+    var mcmid = properties.MCMID;
+    var mcorgid = properties.MCORGID;
+
+    if ( // When TS is not specified or not a number, the following inequality returns false.
+    // All inequalities with NaN variables are false.
+    dateProvider().getTime() / 1000 <= ts + LINK_TTL_SECONDS && mcorgid === orgId && mcmid) {
+      logger.info("Found valid ECID identity " + mcmid + " from the adobe_mc query string parameter.");
+      payload.addIdentity(_ecidNamespace.default, {
+        id: mcmid
+      });
+
+      if (idOverwriteEnabled) {
+        payload.mergeQuery({
+          identity: {
+            overwriteExisting: true
+          }
+        });
+      }
+    } else {
+      logger.info("Detected invalid or expired adobe_mc query string parameter.");
+    }
+  };
+};
+
+exports.default = _default;

package/libEs5/components/Personalization/dom-actions/dom/selectNodesWithEq.js

@@ -21,18 +21,11 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 // Trying to match ID or CSS class
-var CSS_IDENTIFIER_PATTERN = /(#|\.)(-?\w+)/g; // This is required to remove leading " > " from parsed pieces
-
-var SIBLING_PATTERN = /^\s*>?\s*/;
-
-var cleanUp = function cleanUp(str) {
-  return str.replace(SIBLING_PATTERN, "").trim();
-}; // Here we use CSS.escape() to make sure we get
+var CSS_IDENTIFIER_PATTERN = /(#|\.)(-?\w+)/g; // Here we use CSS.escape() to make sure we get
 // correct values for ID and CSS class
 // Please check:  https://www.w3.org/TR/css-syntax-3/#escaping
 // CSS.escape() polyfill can be found here: https://github.com/mathiasbynens/CSS.escape
 
-
 var replaceIdentifier = function replaceIdentifier(_, $1, $2) {
   return "" + $1 + (0, _css.default)($2);
 };
@@ -51,7 +44,7 @@ var parseSelector = function parseSelector(rawSelector) {
   var i = 0;
 
   while (i < length) {
-    var sel = cleanUp(parts[i]);
+    var sel = parts[i];
     var eq = parts[i + 1];
 
     if (eq) {

package/libEs5/components/Privacy/createConsentRequestPayload.js

@@ -23,6 +23,9 @@ var _default = function _default() {
       content.identityMap = content.identityMap || {};
       content.identityMap[namespaceCode] = content.identityMap[namespaceCode] || [];
       content.identityMap[namespaceCode].push(identity);
+    },
+    hasIdentity: function hasIdentity(namespaceCode) {
+      return (content.identityMap && content.identityMap[namespaceCode]) !== undefined;
     }
   });
 

package/libEs5/constants/libraryVersion.js

@@ -15,5 +15,5 @@ governing permissions and limitations under the License.
 */
 // The __VERSION__ keyword will be replace at alloy build time with the package.json version.
 // see babel-plugin-version
-var _default = "2.10.1-beta.0";
+var _default = "2.11.0-alpha.1";
 exports.default = _default;

package/libEs5/constants/queryStringIdentityParam.js

@@ -0,0 +1,17 @@
+"use strict";
+
+exports.default = void 0;
+
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+var _default = "adobe_mc";
+exports.default = _default;

package/libEs5/core/consent/createConsent.js

@@ -59,6 +59,9 @@ var _default = function _default(_ref) {
     },
     awaitConsent: function awaitConsent() {
       return generalConsentState.awaitConsent();
+    },
+    withConsent: function withConsent() {
+      return generalConsentState.withConsent();
     }
   };
 };

package/libEs5/core/consent/createConsentStateMachine.js

@@ -69,7 +69,11 @@ var _default = function _default(_ref) {
     return Promise.reject(createDeclinedConsentError("The user declined consent."));
   };
 
-  var awaitPending = function awaitPending() {
+  var awaitPending = function awaitPending(returnImmediately) {
+    if (returnImmediately) {
+      return Promise.reject(new Error("Consent is pending."));
+    }
+
     var deferred = (0, _utils.defer)();
     deferreds.push(deferred);
     return deferred.promise;
@@ -112,7 +116,10 @@ var _default = function _default(_ref) {
 
       this.awaitConsent = awaitPending;
     },
-    awaitConsent: awaitInitial
+    awaitConsent: awaitInitial,
+    withConsent: function withConsent() {
+      return this.awaitConsent(true);
+    }
   };
 };
 

package/libEs5/utils/dom/querySelectorAll.js

@@ -15,8 +15,22 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
+var SIBLING_PATTERN = /^\s*>/;
+
 var _default = function _default(context, selector) {
-  return (0, _toArray.default)(context.querySelectorAll(selector));
+  if (!SIBLING_PATTERN.test(selector)) {
+    return (0, _toArray.default)(context.querySelectorAll(selector));
+  }
+
+  var tag = "alloy-" + Date.now(); // We could use a :scope selector here, but we want to be IE compliant
+  // so we add a dummy css class to be able to select the children
+
+  try {
+    context.classList.add(tag);
+    return (0, _toArray.default)(context.querySelectorAll("." + tag + " " + selector));
+  } finally {
+    context.classList.remove(tag);
+  }
 };
 
 exports.default = _default;

package/libEs5/utils/request/createDataCollectionRequestPayload.js

@@ -6,6 +6,8 @@ var _createRequestPayload = require("./createRequestPayload");
 
 var _createAddIdentity = require("./createAddIdentity");
 
+var _createHasIdentity = require("./createHasIdentity");
+
 /*
 Copyright 2019 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -21,7 +23,8 @@ var _default = function _default() {
   var content = {};
   var payload = (0, _createRequestPayload.default)({
     content: content,
-    addIdentity: (0, _createAddIdentity.default)(content)
+    addIdentity: (0, _createAddIdentity.default)(content),
+    hasIdentity: (0, _createHasIdentity.default)(content)
   });
 
   payload.addEvent = function (event) {

package/libEs5/utils/request/createHasIdentity.js

@@ -0,0 +1,22 @@
+"use strict";
+
+exports.default = void 0;
+
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+var _default = function _default(content) {
+  return function (namespaceCode) {
+    return (content.xdm && content.xdm.identityMap && content.xdm.identityMap[namespaceCode]) !== undefined;
+  };
+};
+
+exports.default = _default;

package/libEs5/utils/request/createRequestPayload.js

@@ -19,11 +19,13 @@ governing permissions and limitations under the License.
 // request payloads share.
 var _default = function _default(options) {
   var content = options.content,
-      addIdentity = options.addIdentity;
+      addIdentity = options.addIdentity,
+      hasIdentity = options.hasIdentity;
   return {
     mergeState: (0, _.createMerger)(content, "meta.state"),
     mergeQuery: (0, _.createMerger)(content, "query"),
     addIdentity: addIdentity,
+    hasIdentity: hasIdentity,
     toJSON: function toJSON() {
       return content;
     }

package/libEs5/utils/request/index.js

@@ -18,6 +18,12 @@ Object.defineProperty(exports, "createDataCollectionRequestPayload", {
     return _createDataCollectionRequestPayload.default;
   }
 });
+Object.defineProperty(exports, "createHasIdentity", {
+  enumerable: true,
+  get: function get() {
+    return _createHasIdentity.default;
+  }
+});
 Object.defineProperty(exports, "createRequest", {
   enumerable: true,
   get: function get() {
@@ -37,6 +43,8 @@ var _createDataCollectionRequest = require("./createDataCollectionRequest");
 
 var _createDataCollectionRequestPayload = require("./createDataCollectionRequestPayload");
 
+var _createHasIdentity = require("./createHasIdentity");
+
 var _createRequest = require("./createRequest");
 
 var _createRequestPayload = require("./createRequestPayload");

package/libEs6/components/Identity/appendIdentityToUrl/appendIdentityToUrlOptionsValidator.js

@@ -0,0 +1,21 @@
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+import { objectOf, string } from "../../../utils/validation";
+/**
+ * Verifies user provided event options.
+ * @param {*} options The user event options to validate
+ * @returns {*} Validated options
+ */
+
+export default objectOf({
+  url: string().required().nonEmpty()
+}).required().noUnknownFields();

package/libEs6/components/Identity/appendIdentityToUrl/injectAppendIdentityToUrl.js

@@ -0,0 +1,35 @@
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+const URL_REGEX = /^([^?#]*)(\??[^#]*)(#?.*)$/;
+
+const getSeparator = queryString => {
+  if (queryString === "") {
+    return "?";
+  }
+
+  if (queryString === "?") {
+    return "";
+  }
+
+  return "&";
+};
+
+export default (({
+  dateProvider,
+  orgId
+}) => (ecid, url) => {
+  const ts = Math.round(dateProvider().getTime() / 1000);
+  const adobemc = encodeURIComponent(`TS=${ts}|MCMID=${ecid}|MCORGID=${orgId}`);
+  const [, location, queryString, fragment] = url.match(URL_REGEX);
+  const separator = getSeparator(queryString);
+  return `${location}${queryString}${separator}adobe_mc=${adobemc}${fragment}`;
+});

package/libEs6/components/Identity/configValidators.js

@@ -12,6 +12,7 @@ governing permissions and limitations under the License.
 import { boolean } from "../../utils/validation";
 const configValidators = {
   thirdPartyCookiesEnabled: boolean().default(true),
-  idMigrationEnabled: boolean().default(true)
+  idMigrationEnabled: boolean().default(true),
+  idOverwriteEnabled: boolean().default(false)
 };
 export default configValidators;

package/libEs6/components/Identity/createComponent.js

@@ -1,13 +1,17 @@
 import { assign } from "../../utils";
 import getIdentityOptionsValidator from "./getIdentity/getIdentityOptionsValidator";
+import appendIdentityToUrlOptionsValidator from "./appendIdentityToUrl/appendIdentityToUrlOptionsValidator";
 export default (({
   addEcidQueryToPayload,
+  addQueryStringIdentityToPayload,
   ensureSingleIdentity,
   setLegacyEcid,
   handleResponseForIdSyncs,
   getEcidFromResponse,
   getIdentity,
-  consent
+  consent,
+  appendIdentityToUrl,
+  logger
 }) => {
   let ecid;
   let edge = {};
@@ -21,6 +25,7 @@ export default (({
         // Querying the ECID on every request to be able to set the legacy cookie, and make it
         // available for the `getIdentity` command.
         addEcidQueryToPayload(request.getPayload());
+        addQueryStringIdentityToPayload(request.getPayload());
         return ensureSingleIdentity({
           request,
           onResponse,
@@ -62,6 +67,21 @@ export default (({
             };
           });
         }
+      },
+      appendIdentityToUrl: {
+        optionsValidator: appendIdentityToUrlOptionsValidator,
+        run: options => {
+          return consent.withConsent().then(() => {
+            return ecid ? undefined : getIdentity(options.namespaces);
+          }).then(() => {
+            return {
+              url: appendIdentityToUrl(ecid, options.url)
+            };
+          }).catch(error => {
+            logger.warn(`Unable to append identity to url. ${error.message}`);
+            return options;
+          });
+        }
       }
     }
   };

package/libEs6/components/Identity/createLegacyIdentity.js

@@ -61,7 +61,7 @@ export default (({
     },
 
     setEcid(ecid) {
-      if (idMigrationEnabled && !cookieJar.get(amcvCookieName)) {
+      if (idMigrationEnabled && getEcidFromLegacyCookies() !== ecid) {
         cookieJar.set(amcvCookieName, `MCMID|${ecid}`, {
           domain: apexDomain,
           // Without `expires` this will be a session cookie.

package/libEs6/components/Identity/getIdentity/createIdentityRequestPayload.js

@@ -9,7 +9,7 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
-import { createAddIdentity, createRequestPayload } from "../../../utils/request";
+import { createAddIdentity, createHasIdentity, createRequestPayload } from "../../../utils/request";
 export default (namespaces => {
   const content = {
     query: {
@@ -20,6 +20,7 @@ export default (namespaces => {
   };
   return createRequestPayload({
     content,
-    addIdentity: createAddIdentity(content)
+    addIdentity: createAddIdentity(content),
+    hasIdentity: createHasIdentity(content)
   });
 });

package/libEs6/components/Identity/index.js

@@ -21,12 +21,14 @@ import injectEnsureSingleIdentity from "./injectEnsureSingleIdentity";
 import addEcidQueryToPayload from "./addEcidQueryToPayload";
 import injectSetDomainForInitialIdentityPayload from "./injectSetDomainForInitialIdentityPayload";
 import injectAddLegacyEcidToPayload from "./injectAddLegacyEcidToPayload";
+import injectAddQueryStringIdentityToPayload from "./injectAddQueryStringIdentityToPayload";
 import addEcidToPayload from "./addEcidToPayload";
 import injectAwaitIdentityCookie from "./injectAwaitIdentityCookie";
 import getEcidFromResponse from "./getEcidFromResponse";
 import createGetIdentity from "./getIdentity/createGetIdentity";
 import createIdentityRequest from "./getIdentity/createIdentityRequest";
 import createIdentityRequestPayload from "./getIdentity/createIdentityRequestPayload";
+import injectAppendIdentityToUrl from "./appendIdentityToUrl/injectAppendIdentityToUrl";
 
 const createIdentity = ({
   config,
@@ -37,7 +39,8 @@ const createIdentity = ({
 }) => {
   const {
     orgId,
-    thirdPartyCookiesEnabled
+    thirdPartyCookiesEnabled,
+    idOverwriteEnabled
   } = config;
   const getEcidFromVisitor = injectGetEcidFromVisitor({
     logger,
@@ -64,6 +67,13 @@ const createIdentity = ({
     getLegacyEcid: legacyIdentity.getEcid,
     addEcidToPayload
   });
+  const addQueryStringIdentityToPayload = injectAddQueryStringIdentityToPayload({
+    locationSearch: window.document.location.search,
+    dateProvider: () => new Date(),
+    orgId,
+    logger,
+    idOverwriteEnabled
+  });
   const awaitIdentityCookie = injectAwaitIdentityCookie({
     doesIdentityCookieExist,
     orgId
@@ -82,14 +92,21 @@ const createIdentity = ({
   const handleResponseForIdSyncs = injectHandleResponseForIdSyncs({
     processIdSyncs
   });
+  const appendIdentityToUrl = injectAppendIdentityToUrl({
+    dateProvider: () => new Date(),
+    orgId
+  });
   return createComponent({
-    ensureSingleIdentity,
     addEcidQueryToPayload,
+    addQueryStringIdentityToPayload,
+    ensureSingleIdentity,
     setLegacyEcid: legacyIdentity.setEcid,
     handleResponseForIdSyncs,
     getEcidFromResponse,
     getIdentity,
-    consent
+    consent,
+    appendIdentityToUrl,
+    logger
   });
 };
 

package/libEs6/components/Identity/injectAddLegacyEcidToPayload.js

@@ -9,11 +9,18 @@ the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTA
 OF ANY KIND, either express or implied. See the License for the specific language
 governing permissions and limitations under the License.
 */
+import ecidNamespace from "../../constants/ecidNamespace";
 export default (({
   getLegacyEcid,
   addEcidToPayload
 }) => {
   return payload => {
+    if (payload.hasIdentity(ecidNamespace)) {
+      // don't get the legacy identity if we already have the query string identity or if
+      // the user specified it in the identity map
+      return Promise.resolve();
+    }
+
     return getLegacyEcid().then(ecidToMigrate => {
       if (ecidToMigrate) {
         addEcidToPayload(payload, ecidToMigrate);

package/libEs6/components/Identity/injectAddQueryStringIdentityToPayload.js

@@ -0,0 +1,55 @@
+// Example: adobe_mc=TS%3D1641432103%7CMCMID%3D77094828402023918047117570965393734545%7CMCORGID%3DFAF554945B90342F0A495E2C%40AdobeOrg
+// Decoded: adobe_mc=TS=1641432103|MCMID=77094828402023918047117570965393734545|MCORGID=FAF554945B90342F0A495E2C@AdobeOrg
+import { queryString } from "../../utils";
+import queryStringIdentityParam from "../../constants/queryStringIdentityParam";
+import ecidNamespace from "../../constants/ecidNamespace";
+const LINK_TTL_SECONDS = 300; // 5 minute link time to live
+
+export default (({
+  locationSearch,
+  dateProvider,
+  orgId,
+  logger,
+  idOverwriteEnabled
+}) => payload => {
+  if (payload.hasIdentity(ecidNamespace)) {
+    // don't overwrite a user provided ecid identity
+    return;
+  }
+
+  const parsedQueryString = queryString.parse(locationSearch);
+  const queryStringValue = parsedQueryString[queryStringIdentityParam];
+
+  if (queryStringValue === undefined) {
+    return;
+  }
+
+  const properties = queryStringValue.split("|").reduce((memo, keyValue) => {
+    const [key, value] = keyValue.split("=");
+    memo[key] = value;
+    return memo;
+  }, {}); // We are using MCMID and MCORGID to be compatible with Visitor.
+
+  const ts = parseInt(properties.TS, 10);
+  const mcmid = properties.MCMID;
+  const mcorgid = properties.MCORGID;
+
+  if ( // When TS is not specified or not a number, the following inequality returns false.
+  // All inequalities with NaN variables are false.
+  dateProvider().getTime() / 1000 <= ts + LINK_TTL_SECONDS && mcorgid === orgId && mcmid) {
+    logger.info(`Found valid ECID identity ${mcmid} from the adobe_mc query string parameter.`);
+    payload.addIdentity(ecidNamespace, {
+      id: mcmid
+    });
+
+    if (idOverwriteEnabled) {
+      payload.mergeQuery({
+        identity: {
+          overwriteExisting: true
+        }
+      });
+    }
+  } else {
+    logger.info("Detected invalid or expired adobe_mc query string parameter.");
+  }
+});

package/libEs6/components/Personalization/dom-actions/dom/selectNodesWithEq.js

@@ -13,16 +13,11 @@ import escape from "css.escape";
 import { selectNodes } from "../../../../utils/dom";
 import { isNotEqSelector, splitWithEq } from "./helperForEq"; // Trying to match ID or CSS class
 
-const CSS_IDENTIFIER_PATTERN = /(#|\.)(-?\w+)/g; // This is required to remove leading " > " from parsed pieces
-
-const SIBLING_PATTERN = /^\s*>?\s*/;
-
-const cleanUp = str => str.replace(SIBLING_PATTERN, "").trim(); // Here we use CSS.escape() to make sure we get
+const CSS_IDENTIFIER_PATTERN = /(#|\.)(-?\w+)/g; // Here we use CSS.escape() to make sure we get
 // correct values for ID and CSS class
 // Please check:  https://www.w3.org/TR/css-syntax-3/#escaping
 // CSS.escape() polyfill can be found here: https://github.com/mathiasbynens/CSS.escape
 
-
 const replaceIdentifier = (_, $1, $2) => `${$1}${escape($2)}`;
 
 export const escapeIdentifiersInSelector = selector => {
@@ -38,7 +33,7 @@ export const parseSelector = rawSelector => {
   let i = 0;
 
   while (i < length) {
-    const sel = cleanUp(parts[i]);
+    const sel = parts[i];
     const eq = parts[i + 1];
 
     if (eq) {

package/libEs6/components/Privacy/createConsentRequestPayload.js

@@ -18,6 +18,9 @@ export default (() => {
       content.identityMap = content.identityMap || {};
       content.identityMap[namespaceCode] = content.identityMap[namespaceCode] || [];
       content.identityMap[namespaceCode].push(identity);
+    },
+    hasIdentity: namespaceCode => {
+      return (content.identityMap && content.identityMap[namespaceCode]) !== undefined;
     }
   });
 

package/libEs6/constants/libraryVersion.js

@@ -11,4 +11,4 @@ governing permissions and limitations under the License.
 */
 // The __VERSION__ keyword will be replace at alloy build time with the package.json version.
 // see babel-plugin-version
-export default "2.10.1-beta.0";
+export default "2.11.0-alpha.1";

package/libEs6/constants/queryStringIdentityParam.js

@@ -0,0 +1,12 @@
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+export default "adobe_mc";

package/libEs6/core/consent/createConsent.js

@@ -55,6 +55,10 @@ export default (({
 
     awaitConsent() {
       return generalConsentState.awaitConsent();
+    },
+
+    withConsent() {
+      return generalConsentState.withConsent();
     }
 
   };

package/libEs6/core/consent/createConsentStateMachine.js

@@ -50,7 +50,11 @@ export default (({
 
   const awaitOut = () => Promise.reject(createDeclinedConsentError("The user declined consent."));
 
-  const awaitPending = () => {
+  const awaitPending = returnImmediately => {
+    if (returnImmediately) {
+      return Promise.reject(new Error("Consent is pending."));
+    }
+
     const deferred = defer();
     deferreds.push(deferred);
     return deferred.promise;
@@ -96,6 +100,11 @@ export default (({
       this.awaitConsent = awaitPending;
     },
 
-    awaitConsent: awaitInitial
+    awaitConsent: awaitInitial,
+
+    withConsent() {
+      return this.awaitConsent(true);
+    }
+
   };
 });

package/libEs6/utils/dom/querySelectorAll.js

@@ -10,4 +10,19 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 import toArray from "../toArray";
-export default ((context, selector) => toArray(context.querySelectorAll(selector)));
+const SIBLING_PATTERN = /^\s*>/;
+export default ((context, selector) => {
+  if (!SIBLING_PATTERN.test(selector)) {
+    return toArray(context.querySelectorAll(selector));
+  }
+
+  const tag = `alloy-${Date.now()}`; // We could use a :scope selector here, but we want to be IE compliant
+  // so we add a dummy css class to be able to select the children
+
+  try {
+    context.classList.add(tag);
+    return toArray(context.querySelectorAll(`.${tag} ${selector}`));
+  } finally {
+    context.classList.remove(tag);
+  }
+});

package/libEs6/utils/request/createDataCollectionRequestPayload.js

@@ -11,11 +11,13 @@ governing permissions and limitations under the License.
 */
 import createRequestPayload from "./createRequestPayload";
 import createAddIdentity from "./createAddIdentity";
+import createHasIdentity from "./createHasIdentity";
 export default (() => {
   const content = {};
   const payload = createRequestPayload({
     content,
-    addIdentity: createAddIdentity(content)
+    addIdentity: createAddIdentity(content),
+    hasIdentity: createHasIdentity(content)
   });
 
   payload.addEvent = event => {

package/libEs6/utils/request/createHasIdentity.js

@@ -0,0 +1,14 @@
+/*
+Copyright 2022 Adobe. All rights reserved.
+This file is licensed to you under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License. You may obtain a copy
+of the License at http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software distributed under
+the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR REPRESENTATIONS
+OF ANY KIND, either express or implied. See the License for the specific language
+governing permissions and limitations under the License.
+*/
+export default (content => namespaceCode => {
+  return (content.xdm && content.xdm.identityMap && content.xdm.identityMap[namespaceCode]) !== undefined;
+});

package/libEs6/utils/request/createRequestPayload.js

@@ -15,12 +15,14 @@ import { createMerger } from ".."; // This provides the base functionality that
 export default (options => {
   const {
     content,
-    addIdentity
+    addIdentity,
+    hasIdentity
   } = options;
   return {
     mergeState: createMerger(content, "meta.state"),
     mergeQuery: createMerger(content, "query"),
     addIdentity,
+    hasIdentity,
 
     toJSON() {
       return content;

package/libEs6/utils/request/index.js

@@ -12,5 +12,6 @@ governing permissions and limitations under the License.
 export { default as createAddIdentity } from "./createAddIdentity";
 export { default as createDataCollectionRequest } from "./createDataCollectionRequest";
 export { default as createDataCollectionRequestPayload } from "./createDataCollectionRequestPayload";
+export { default as createHasIdentity } from "./createHasIdentity";
 export { default as createRequest } from "./createRequest";
 export { default as createRequestPayload } from "./createRequestPayload";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.10.1-beta.0",
+  "version": "2.11.0-alpha.1",
   "description": "Adobe Experience Platform Web SDK",
   "main": "libEs5/index.js",
   "module": "libEs6/index.js",
@@ -64,7 +64,7 @@
     "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "@adobe/alloy": "^2.10.1-alpha.0",
+    "@adobe/alloy": "^2.11.0-alpha.0",
     "@babel/cli": "^7.12.8",
     "@babel/core": "^7.2.2",
     "@babel/plugin-proposal-object-rest-spread": "^7.3.2",