@adobe/alloy 2.19.1 → 2.19.2-beta.0

package/libEs5/components/Identity/index.js

@@ -86,7 +86,8 @@ var createIdentity = function createIdentity(_ref) {
   });
   var awaitIdentityCookie = (0, _injectAwaitIdentityCookie.default)({
     doesIdentityCookieExist: doesIdentityCookieExist,
-    orgId: orgId
+    orgId: orgId,
+    logger: logger
   });
   var ensureSingleIdentity = (0, _injectEnsureSingleIdentity.default)({
     doesIdentityCookieExist: doesIdentityCookieExist,

package/libEs5/components/Identity/injectAddQueryStringIdentityToPayload.js

@@ -37,6 +37,10 @@ var _default = function _default(_ref) {
     if (queryStringValue === undefined) {
       return;
     }
+    if (Array.isArray(queryStringValue)) {
+      logger.warn("Found multiple adobe_mc query string paramters, only using the last one.");
+      queryStringValue = queryStringValue[queryStringValue.length - 1];
+    }
     var properties = queryStringValue.split("|").reduce(function (memo, keyValue) {
       var _keyValue$split = keyValue.split("="),
         _keyValue$split2 = _slicedToArray(_keyValue$split, 2),

package/libEs5/components/Identity/injectAwaitIdentityCookie.js

@@ -14,7 +14,8 @@ governing permissions and limitations under the License.
 */
 var _default = function _default(_ref) {
   var doesIdentityCookieExist = _ref.doesIdentityCookieExist,
-    orgId = _ref.orgId;
+    orgId = _ref.orgId,
+    logger = _ref.logger;
   /**
    * Returns a promise that will be resolved once an identity cookie exists.
    * If an identity cookie doesn't already exist, it should always exist after
@@ -30,16 +31,11 @@ var _default = function _default(_ref) {
         } else {
           // This logic assumes that the code setting the cookie is working as expected and that
           // the cookie was missing from the response.
-          var noIdentityCookieError = new Error("An identity was not set properly. Please verify that the org ID " + orgId + " configured in Alloy matches the org ID specified in the edge configuration.");
+          logger.warn("Identity cookie not found. This could be caused by any of the following issues:\n" + ("\t* The org ID " + orgId + " configured in Alloy doesn't match the org ID specified in the edge configuration.\n") + "\t* Experience edge was not able to set the identity cookie due to domain or cookie restrictions.\n" + "\t* The request was canceled by the browser and not fully processed.");
 
-          // Rejecting the promise will reject commands that were queued
-          // by the Identity component while waiting on the response to
-          // the initial request.
-          reject(noIdentityCookieError);
-
-          // Throwing an error will reject the event command that initiated
-          // the request.
-          throw noIdentityCookieError;
+          // Rejecting the promise will tell queued events to still go out
+          // one at a time.
+          reject(new Error("Identity cookie not found."));
         }
       });
       onRequestFailure(function () {
@@ -48,7 +44,7 @@ var _default = function _default(_ref) {
         } else {
           // The error from the request failure will be logged separately. Rejecting this here
           // will tell ensureSingleIdentity to send the next request without identity
-          reject(new Error("No identity was set on response."));
+          reject(new Error("Identity cookie not found."));
         }
       });
     });

package/libEs5/components/Identity/injectEnsureSingleIdentity.js

@@ -55,9 +55,8 @@ var _default = function _default(_ref) {
     if (obtainedIdentityPromise) {
       // We don't have an identity cookie, but at least one request has
       // been sent to get it. Konductor may set the identity cookie in the
-      // response. We will hold up this request until the last request
-      // requiring identity returns and awaitIdentityCookie confirms the
-      // identity was set.
+      // response. We will hold up this request until the previous request
+      // returns and awaitIdentityCookie confirms the identity was set.
       logger.info("Delaying request while retrieving ECID from server.");
       var previousObtainedIdentityPromise = obtainedIdentityPromise;
 
@@ -92,6 +91,10 @@ var _default = function _default(_ref) {
       onResponse: onResponse,
       onRequestFailure: onRequestFailure
     });
+    // This prevents an un-caught promise in the console when the identity isn't set.
+    obtainedIdentityPromise.catch(function () {
+      return undefined;
+    });
     return allowRequestToGoWithoutIdentity(request);
   };
 };

package/libEs5/components/Personalization/createFetchDataHandler.js

@@ -38,7 +38,10 @@ var _default = function _default(_ref) {
       showContainers();
     }
     mergeQuery(event, personalizationDetails.createQueryDetails());
-    var handleNotifications = notificationHandler(personalizationDetails.isSendDisplayEvent(), personalizationDetails.getViewName());
+
+    // This needs to be called before the response so that future sendEvent calls
+    // can know to wait until this request is complete for pending display notifications.
+    var handleNotifications = notificationHandler(personalizationDetails.isRenderDecisions(), personalizationDetails.isSendDisplayEvent(), personalizationDetails.getViewName());
     onResponse(function (_ref3) {
       var response = _ref3.response;
       var handles = response.getPayloadsByType(DECISIONS_HANDLE);

package/libEs5/components/Personalization/createNotificationHandler.js

@@ -14,8 +14,14 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 var _default = function _default(collect, renderedPropositions) {
-  return function (sendDisplayEvent, viewName) {
-    if (!sendDisplayEvent) {
+  return function (isRenderDecisions, isSendDisplayEvent, viewName) {
+    if (!isRenderDecisions) {
+      // If we aren't rendering anything, then we don't need to sendDisplayEvents.
+      return function () {
+        return undefined;
+      };
+    }
+    if (!isSendDisplayEvent) {
       var renderedPropositionsDeferred = (0, _utils.defer)();
       renderedPropositions.concat(renderedPropositionsDeferred.promise);
       return renderedPropositionsDeferred.resolve;

package/libEs5/components/Personalization/createOnDecisionHandler.js

@@ -34,7 +34,7 @@ var _default = function _default(_ref) {
     var _processPropositions = processPropositions(propositionsToExecute),
       render = _processPropositions.render,
       returnedPropositions = _processPropositions.returnedPropositions;
-    var handleNotifications = notificationHandler(sendDisplayEvent, viewName);
+    var handleNotifications = notificationHandler(renderDecisions, sendDisplayEvent, viewName);
     render().then(handleNotifications);
     return Promise.resolve({
       propositions: returnedPropositions

package/libEs5/constants/libraryVersion.js

@@ -14,5 +14,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.19.1";
+var _default = "2.19.2-beta.0";
 exports.default = _default;

package/libEs6/components/Identity/index.js

@@ -84,7 +84,8 @@ const createIdentity = ({
   });
   const awaitIdentityCookie = injectAwaitIdentityCookie({
     doesIdentityCookieExist,
-    orgId
+    orgId,
+    logger
   });
   const ensureSingleIdentity = injectEnsureSingleIdentity({
     doesIdentityCookieExist,

package/libEs6/components/Identity/injectAddQueryStringIdentityToPayload.js

@@ -28,10 +28,14 @@ export default (({
     return;
   }
   const parsedQueryString = queryString.parse(locationSearch);
-  const queryStringValue = parsedQueryString[queryStringIdentityParam];
+  let queryStringValue = parsedQueryString[queryStringIdentityParam];
   if (queryStringValue === undefined) {
     return;
   }
+  if (Array.isArray(queryStringValue)) {
+    logger.warn("Found multiple adobe_mc query string paramters, only using the last one.");
+    queryStringValue = queryStringValue[queryStringValue.length - 1];
+  }
   const properties = queryStringValue.split("|").reduce((memo, keyValue) => {
     const [key, value] = keyValue.split("=");
     memo[key] = value;

package/libEs6/components/Identity/injectAwaitIdentityCookie.js

@@ -12,7 +12,8 @@ governing permissions and limitations under the License.
 
 export default (({
   doesIdentityCookieExist,
-  orgId
+  orgId,
+  logger
 }) => {
   /**
    * Returns a promise that will be resolved once an identity cookie exists.
@@ -30,16 +31,11 @@ export default (({
         } else {
           // This logic assumes that the code setting the cookie is working as expected and that
           // the cookie was missing from the response.
-          const noIdentityCookieError = new Error(`An identity was not set properly. Please verify that the org ID ${orgId} configured in Alloy matches the org ID specified in the edge configuration.`);
+          logger.warn(`Identity cookie not found. This could be caused by any of the following issues:\n` + `\t* The org ID ${orgId} configured in Alloy doesn't match the org ID specified in the edge configuration.\n` + `\t* Experience edge was not able to set the identity cookie due to domain or cookie restrictions.\n` + `\t* The request was canceled by the browser and not fully processed.`);
 
-          // Rejecting the promise will reject commands that were queued
-          // by the Identity component while waiting on the response to
-          // the initial request.
-          reject(noIdentityCookieError);
-
-          // Throwing an error will reject the event command that initiated
-          // the request.
-          throw noIdentityCookieError;
+          // Rejecting the promise will tell queued events to still go out
+          // one at a time.
+          reject(new Error("Identity cookie not found."));
         }
       });
       onRequestFailure(() => {
@@ -48,7 +44,7 @@ export default (({
         } else {
           // The error from the request failure will be logged separately. Rejecting this here
           // will tell ensureSingleIdentity to send the next request without identity
-          reject(new Error("No identity was set on response."));
+          reject(new Error("Identity cookie not found."));
         }
       });
     });

package/libEs6/components/Identity/injectEnsureSingleIdentity.js

@@ -55,9 +55,8 @@ export default (({
     if (obtainedIdentityPromise) {
       // We don't have an identity cookie, but at least one request has
       // been sent to get it. Konductor may set the identity cookie in the
-      // response. We will hold up this request until the last request
-      // requiring identity returns and awaitIdentityCookie confirms the
-      // identity was set.
+      // response. We will hold up this request until the previous request
+      // returns and awaitIdentityCookie confirms the identity was set.
       logger.info("Delaying request while retrieving ECID from server.");
       const previousObtainedIdentityPromise = obtainedIdentityPromise;
 
@@ -92,6 +91,8 @@ export default (({
       onResponse,
       onRequestFailure
     });
+    // This prevents an un-caught promise in the console when the identity isn't set.
+    obtainedIdentityPromise.catch(() => undefined);
     return allowRequestToGoWithoutIdentity(request);
   };
 });

package/libEs6/components/Personalization/createFetchDataHandler.js

@@ -32,7 +32,10 @@ export default (({
       showContainers();
     }
     mergeQuery(event, personalizationDetails.createQueryDetails());
-    const handleNotifications = notificationHandler(personalizationDetails.isSendDisplayEvent(), personalizationDetails.getViewName());
+
+    // This needs to be called before the response so that future sendEvent calls
+    // can know to wait until this request is complete for pending display notifications.
+    const handleNotifications = notificationHandler(personalizationDetails.isRenderDecisions(), personalizationDetails.isSendDisplayEvent(), personalizationDetails.getViewName());
     onResponse(({
       response
     }) => {

package/libEs6/components/Personalization/createNotificationHandler.js

@@ -11,8 +11,12 @@ governing permissions and limitations under the License.
 */
 import { defer } from "../../utils";
 export default ((collect, renderedPropositions) => {
-  return (sendDisplayEvent, viewName) => {
-    if (!sendDisplayEvent) {
+  return (isRenderDecisions, isSendDisplayEvent, viewName) => {
+    if (!isRenderDecisions) {
+      // If we aren't rendering anything, then we don't need to sendDisplayEvents.
+      return () => undefined;
+    }
+    if (!isSendDisplayEvent) {
       const renderedPropositionsDeferred = defer();
       renderedPropositions.concat(renderedPropositionsDeferred.promise);
       return renderedPropositionsDeferred.resolve;

package/libEs6/components/Personalization/createOnDecisionHandler.js

@@ -33,7 +33,7 @@ export default (({
       render,
       returnedPropositions
     } = processPropositions(propositionsToExecute);
-    const handleNotifications = notificationHandler(sendDisplayEvent, viewName);
+    const handleNotifications = notificationHandler(renderDecisions, sendDisplayEvent, viewName);
     render().then(handleNotifications);
     return Promise.resolve({
       propositions: returnedPropositions

package/libEs6/constants/libraryVersion.js

@@ -13,4 +13,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.19.1";
+export default "2.19.2-beta.0";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.19.1",
+  "version": "2.19.2-beta.0",
   "description": "Adobe Experience Platform Web SDK",
   "main": "libEs5/index.js",
   "module": "libEs6/index.js",
@@ -31,7 +31,8 @@
     "prepare": "husky install && cd sandbox && npm install",
     "prepublishOnly": "rimraf libEs5 libEs6 && babel src -d libEs5 --env-name npmEs5 && babel src -d libEs6 --env-name npmEs6",
     "checkthattestfilesexist": "./scripts/checkThatTestFilesExist.js",
-    "add-license": "./scripts/add-license.js"
+    "add-license": "./scripts/add-license.js",
+    "preinstall": "npx force-resolutions"
   },
   "lint-staged": {
     "./*.js": [
@@ -70,7 +71,7 @@
     "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "@adobe/alloy": "^2.19.1-beta.0",
+    "@adobe/alloy": "^2.19.1",
     "@babel/cli": "^7.12.8",
     "@babel/core": "^7.2.2",
     "@babel/plugin-proposal-object-rest-spread": "^7.3.2",
@@ -91,6 +92,7 @@
     "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-prettier": "^3.0.1",
     "eslint-plugin-testcafe": "^0.2.1",
+    "force-resolutions": "^1.0.11",
     "glob": "^7.1.3",
     "handlebars": "^4.7.7",
     "husky": "^6.0.0",
@@ -134,5 +136,8 @@
     "url-exists-nodejs": "^0.1.0",
     "url-parse": "^1.4.7",
     "yargs": "^16.2.0"
+  },
+  "resolutions": {
+    "webdriverio": "^7.19.5"
   }
 }

package/libEs5/utils/debounce.js

@@ -1,30 +0,0 @@
-"use strict";
-
-exports.default = void 0;
-/*
-Copyright 2023 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(fn) {
-  var delay = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 150;
-  var timer;
-  return function () {
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    if (timer) {
-      clearTimeout(timer);
-    }
-    timer = setTimeout(function () {
-      fn.apply(void 0, args);
-    }, delay);
-  };
-};
-exports.default = _default;

package/libEs6/utils/debounce.js

@@ -1,22 +0,0 @@
-/*
-Copyright 2023 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 ((fn, delay = 150) => {
-  let timer;
-  return (...args) => {
-    if (timer) {
-      clearTimeout(timer);
-    }
-    timer = setTimeout(() => {
-      fn(...args);
-    }, delay);
-  };
-});