@adobe/alloy 2.11.0-alpha.1 → 2.11.0-alpha.4

package/libEs5/components/Context/injectPlaceContext.js

@@ -19,9 +19,14 @@ var _default = function _default(dateProvider) {
   return function (xdm) {
     var date = dateProvider();
     var placeContext = {
-      localTime: (0, _utils.toISOStringLocal)(date),
-      localTimezoneOffset: date.getTimezoneOffset()
+      localTime: (0, _utils.toISOStringLocal)(date)
     };
+    var localTimezoneOffset = (0, _utils.toInteger)(date.getTimezoneOffset());
+
+    if (localTimezoneOffset !== undefined) {
+      placeContext.localTimezoneOffset = localTimezoneOffset;
+    }
+
     (0, _utils.deepAssign)(xdm, {
       placeContext: placeContext
     });

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

@@ -44,7 +44,7 @@ var _default = function _default(_ref) {
       orgId = _ref.orgId;
   return function (ecid, url) {
     var ts = Math.round(dateProvider().getTime() / 1000);
-    var adobemc = encodeURIComponent("TS=" + ts + "|MCMID=" + ecid + "|MCORGID=" + orgId);
+    var adobemc = encodeURIComponent("TS=" + ts + "|MCMID=" + ecid + "|MCORGID=" + encodeURIComponent(orgId));
 
     var _url$match = url.match(URL_REGEX),
         _url$match2 = _slicedToArray(_url$match, 4),

package/libEs5/components/Identity/configValidators.js

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

package/libEs5/components/Identity/index.js

@@ -60,8 +60,7 @@ var createIdentity = function createIdentity(_ref) {
       fireReferrerHideableImage = _ref.fireReferrerHideableImage,
       sendEdgeNetworkRequest = _ref.sendEdgeNetworkRequest;
   var orgId = config.orgId,
-      thirdPartyCookiesEnabled = config.thirdPartyCookiesEnabled,
-      idOverwriteEnabled = config.idOverwriteEnabled;
+      thirdPartyCookiesEnabled = config.thirdPartyCookiesEnabled;
   var getEcidFromVisitor = (0, _injectGetEcidFromVisitor.default)({
     logger: logger,
     orgId: orgId,
@@ -93,8 +92,7 @@ var createIdentity = function createIdentity(_ref) {
       return new Date();
     },
     orgId: orgId,
-    logger: logger,
-    idOverwriteEnabled: idOverwriteEnabled
+    logger: logger
   });
   var awaitIdentityCookie = (0, _injectAwaitIdentityCookie.default)({
     doesIdentityCookieExist: doesIdentityCookieExist,

package/libEs5/components/Identity/injectAddQueryStringIdentityToPayload.js

@@ -26,8 +26,7 @@ var _default = function _default(_ref) {
   var locationSearch = _ref.locationSearch,
       dateProvider = _ref.dateProvider,
       orgId = _ref.orgId,
-      logger = _ref.logger,
-      idOverwriteEnabled = _ref.idOverwriteEnabled;
+      logger = _ref.logger;
   return function (payload) {
     if (payload.hasIdentity(_ecidNamespace.default)) {
       // don't overwrite a user provided ecid identity
@@ -54,7 +53,7 @@ var _default = function _default(_ref) {
 
     var ts = parseInt(properties.TS, 10);
     var mcmid = properties.MCMID;
-    var mcorgid = properties.MCORGID;
+    var mcorgid = decodeURIComponent(properties.MCORGID);
 
     if ( // When TS is not specified or not a number, the following inequality returns false.
     // All inequalities with NaN variables are false.
@@ -63,14 +62,6 @@ var _default = function _default(_ref) {
       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.");
     }

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.11.0-alpha.1";
+var _default = "2.11.0-alpha.4";
 exports.default = _default;

package/libEs5/utils/index.js

@@ -282,6 +282,12 @@ Object.defineProperty(exports, "toISOStringLocal", {
     return _toISOStringLocal.default;
   }
 });
+Object.defineProperty(exports, "toInteger", {
+  enumerable: true,
+  get: function get() {
+    return _toInteger.default;
+  }
+});
 Object.defineProperty(exports, "updateErrorMessage", {
   enumerable: true,
   get: function get() {
@@ -399,6 +405,8 @@ var _toArray = require("./toArray");
 
 var _toError = require("./toError");
 
+var _toInteger = require("./toInteger");
+
 var _toISOStringLocal = require("./toISOStringLocal");
 
 var _uuid = require("./uuid");

package/libEs5/utils/toISOStringLocal.js

@@ -4,6 +4,8 @@ exports.default = void 0;
 
 var _padStart = require("./padStart");
 
+var _toInteger = require("./toInteger");
+
 /*
 Copyright 2019 Adobe. All rights reserved.
 This file is licensed to you under the Apache License, Version 2.0 (the "License");
@@ -32,7 +34,7 @@ var _default = function _default(date) {
   // means that the offset is positive if the local timezone is behind UTC and negative if it is
   // ahead. For example, for time zone UTC+10:00, -600 will be returned.
 
-  var timezoneOffset = date.getTimezoneOffset();
+  var timezoneOffset = (0, _toInteger.default)(date.getTimezoneOffset(), 0);
   var ts = timezoneOffset > 0 ? "-" : "+";
   var th = (0, _padStart.default)(Math.floor(Math.abs(timezoneOffset) / 60), 2, "0");
   var tm = (0, _padStart.default)(Math.abs(timezoneOffset) % 60, 2, "0");

package/libEs5/utils/toInteger.js

@@ -0,0 +1,26 @@
+"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.
+*/
+
+/*
+ * coerce `value` to a number or return `defaultValue` if it cannot be.
+ */
+var _default = function _default(value, defaultValue) {
+  var n = Math.round(Number(value)); // eslint-disable-next-line no-restricted-globals
+
+  return isNaN(n) ? defaultValue : n;
+};
+
+exports.default = _default;

package/libEs6/components/Context/injectPlaceContext.js

@@ -9,14 +9,19 @@ 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 { deepAssign, toISOStringLocal } from "../../utils";
+import { deepAssign, toISOStringLocal, toInteger } from "../../utils";
 export default (dateProvider => {
   return xdm => {
     const date = dateProvider();
     const placeContext = {
-      localTime: toISOStringLocal(date),
-      localTimezoneOffset: date.getTimezoneOffset()
+      localTime: toISOStringLocal(date)
     };
+    const localTimezoneOffset = toInteger(date.getTimezoneOffset());
+
+    if (localTimezoneOffset !== undefined) {
+      placeContext.localTimezoneOffset = localTimezoneOffset;
+    }
+
     deepAssign(xdm, {
       placeContext
     });

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

@@ -28,7 +28,7 @@ export default (({
   orgId
 }) => (ecid, url) => {
   const ts = Math.round(dateProvider().getTime() / 1000);
-  const adobemc = encodeURIComponent(`TS=${ts}|MCMID=${ecid}|MCORGID=${orgId}`);
+  const adobemc = encodeURIComponent(`TS=${ts}|MCMID=${ecid}|MCORGID=${encodeURIComponent(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,7 +12,6 @@ governing permissions and limitations under the License.
 import { boolean } from "../../utils/validation";
 const configValidators = {
   thirdPartyCookiesEnabled: boolean().default(true),
-  idMigrationEnabled: boolean().default(true),
-  idOverwriteEnabled: boolean().default(false)
+  idMigrationEnabled: boolean().default(true)
 };
 export default configValidators;

package/libEs6/components/Identity/index.js

@@ -39,8 +39,7 @@ const createIdentity = ({
 }) => {
   const {
     orgId,
-    thirdPartyCookiesEnabled,
-    idOverwriteEnabled
+    thirdPartyCookiesEnabled
   } = config;
   const getEcidFromVisitor = injectGetEcidFromVisitor({
     logger,
@@ -71,8 +70,7 @@ const createIdentity = ({
     locationSearch: window.document.location.search,
     dateProvider: () => new Date(),
     orgId,
-    logger,
-    idOverwriteEnabled
+    logger
   });
   const awaitIdentityCookie = injectAwaitIdentityCookie({
     doesIdentityCookieExist,

package/libEs6/components/Identity/injectAddQueryStringIdentityToPayload.js

@@ -9,8 +9,7 @@ export default (({
   locationSearch,
   dateProvider,
   orgId,
-  logger,
-  idOverwriteEnabled
+  logger
 }) => payload => {
   if (payload.hasIdentity(ecidNamespace)) {
     // don't overwrite a user provided ecid identity
@@ -32,7 +31,7 @@ export default (({
 
   const ts = parseInt(properties.TS, 10);
   const mcmid = properties.MCMID;
-  const mcorgid = properties.MCORGID;
+  const mcorgid = decodeURIComponent(properties.MCORGID);
 
   if ( // When TS is not specified or not a number, the following inequality returns false.
   // All inequalities with NaN variables are false.
@@ -41,14 +40,6 @@ export default (({
     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/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.11.0-alpha.1";
+export default "2.11.0-alpha.4";

package/libEs6/utils/index.js

@@ -56,6 +56,7 @@ export { default as startsWith } from "./startsWith";
 export { default as stringToBoolean } from "./stringToBoolean";
 export { default as toArray } from "./toArray";
 export { default as toError } from "./toError";
+export { default as toInteger } from "./toInteger";
 export { default as toISOStringLocal } from "./toISOStringLocal";
 export { default as uuid } from "./uuid";
 export { default as updateErrorMessage } from "./updateErrorMessage";

package/libEs6/utils/toISOStringLocal.js

@@ -10,6 +10,7 @@ OF ANY KIND, either express or implied. See the License for the specific languag
 governing permissions and limitations under the License.
 */
 import padStart from "./padStart";
+import toInteger from "./toInteger";
 /**
  * Formats the date into an ISO date-time string in the local timezone
  * @param {Date} date
@@ -27,7 +28,7 @@ export default (date => {
   // means that the offset is positive if the local timezone is behind UTC and negative if it is
   // ahead. For example, for time zone UTC+10:00, -600 will be returned.
 
-  const timezoneOffset = date.getTimezoneOffset();
+  const timezoneOffset = toInteger(date.getTimezoneOffset(), 0);
   const ts = timezoneOffset > 0 ? "-" : "+";
   const th = padStart(Math.floor(Math.abs(timezoneOffset) / 60), 2, "0");
   const tm = padStart(Math.abs(timezoneOffset) % 60, 2, "0");

package/libEs6/utils/toInteger.js

@@ -0,0 +1,20 @@
+/*
+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.
+*/
+
+/*
+ * coerce `value` to a number or return `defaultValue` if it cannot be.
+ */
+export default ((value, defaultValue) => {
+  const n = Math.round(Number(value)); // eslint-disable-next-line no-restricted-globals
+
+  return isNaN(n) ? defaultValue : n;
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/alloy",
-  "version": "2.11.0-alpha.1",
+  "version": "2.11.0-alpha.4",
   "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.11.0-alpha.0",
+    "@adobe/alloy": "^2.11.0-alpha.3",
     "@babel/cli": "^7.12.8",
     "@babel/core": "^7.2.2",
     "@babel/plugin-proposal-object-rest-spread": "^7.3.2",