@constructor-io/constructorio-client-javascript 2.49.1 → 2.49.2

package/lib/utils/helpers.js

@@ -8,14 +8,14 @@ var store = require('./store');
 var purchaseEventStorageKey = '_constructorio_purchase_order_ids';
 var PII_REGEX = [{
   pattern: /[\w\-+\\.]+@([\w-]+\.)+[\w-]{2,4}/,
-  replaceBy: '<email_omitted>'
+  replaceWith: '<email_omitted>'
 }, {
   pattern: /^(?:\+\d{11,12}|\+\d{1,3}\s\d{3}\s\d{3}\s\d{3,4}|\(\d{3}\)\d{7}|\(\d{3}\)\s\d{3}\s\d{4}|\(\d{3}\)\d{3}-\d{4}|\(\d{3}\)\s\d{3}-\d{4})$/,
-  replaceBy: '<phone_omitted>'
+  replaceWith: '<phone_omitted>'
 }, {
   pattern: /^(?:4[0-9]{15}|(?:5[1-5][0-9]{2}|222[1-9]|22[3-9][0-9]|2[3-6][0-9]{2}|27[01][0-9]|2720)[0-9]{12}|3[47][0-9]{13}|3(?:0[0-5]|[68][0-9])[0-9]{11}|6(?:011|5[0-9]{2})[0-9]{12}|(?:2131|1800|35\d{3})\d{11})$/,
   // Visa, Mastercard, Amex, Discover, JCB and Diners Club, regex source: https://www.regular-expressions.info/creditcard.html
-  replaceBy: '<credit_omitted>'
+  replaceWith: '<credit_omitted>'
 }
 // Add more PII REGEX
 ];
@@ -24,7 +24,7 @@ var utils = {
   trimNonBreakingSpaces: function trimNonBreakingSpaces(string) {
     return string.replace(/\s/g, ' ').trim();
   },
-  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent
+  // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/encodeURIComponent#encoding_for_rfc3986
   encodeURIComponentRFC3986: function encodeURIComponentRFC3986(string) {
     return encodeURIComponent(string).replace(/[!'()*]/g, function (c) {
       return "%".concat(c.charCodeAt(0).toString(16).toUpperCase());
@@ -209,19 +209,27 @@ var utils = {
   obfuscatePiiRequest: function obfuscatePiiRequest(urlString) {
     var obfuscatedUrl = urlString;
     try {
-      var _decodeURI, _decodeURIComponent;
+      var _url$pathname, _url$search, _url$search$split;
       var url = new URL(urlString);
-      var paths = (_decodeURI = decodeURI(url === null || url === void 0 ? void 0 : url.pathname)) === null || _decodeURI === void 0 ? void 0 : _decodeURI.split('/');
-      var paramValues = (_decodeURIComponent = decodeURIComponent(url === null || url === void 0 ? void 0 : url.search)) === null || _decodeURIComponent === void 0 ? void 0 : _decodeURIComponent.split('&').map(function (param) {
+      var paths = url === null || url === void 0 ? void 0 : (_url$pathname = url.pathname) === null || _url$pathname === void 0 ? void 0 : _url$pathname.split('/');
+      var paramValues = url === null || url === void 0 ? void 0 : (_url$search = url.search) === null || _url$search === void 0 ? void 0 : (_url$search$split = _url$search.split('&')) === null || _url$search$split === void 0 ? void 0 : _url$search$split.map(function (param) {
         var _param$split;
-        return param === null || param === void 0 ? void 0 : (_param$split = param.split('=')) === null || _param$split === void 0 ? void 0 : _param$split[1];
+        return (_param$split = param.split('=')) === null || _param$split === void 0 ? void 0 : _param$split[1];
       });
-      PII_REGEX.forEach(function (regex) {
+      PII_REGEX.forEach(function (_ref3) {
+        var pattern = _ref3.pattern,
+          replaceWith = _ref3.replaceWith;
         paths.forEach(function (path) {
-          if (utils.containsPii(path, regex.pattern)) obfuscatedUrl = obfuscatedUrl.replaceAll(path, regex.replaceBy);
+          var decodedPath = decodeURIComponent(path);
+          if (utils.containsPii(decodedPath, pattern)) {
+            obfuscatedUrl = obfuscatedUrl.replaceAll(path, replaceWith);
+          }
         });
-        paramValues.forEach(function (param) {
-          if (utils.containsPii(param, regex.pattern)) obfuscatedUrl = obfuscatedUrl.replaceAll(param, regex.replaceBy);
+        paramValues.forEach(function (paramValue) {
+          var decodedParamValue = decodeURIComponent(paramValue);
+          if (utils.containsPii(decodedParamValue, pattern)) {
+            obfuscatedUrl = obfuscatedUrl.replaceAll(decodedParamValue, replaceWith);
+          }
         });
       });
     } catch (e) {

package/lib/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _default = '2.49.1';
+var _default = '2.49.2';
 exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@constructor-io/constructorio-client-javascript",
-  "version": "2.49.1",
+  "version": "2.49.2",
   "description": "Constructor.io JavaScript client",
   "main": "lib/constructorio.js",
   "types": "lib/types/index.d.ts",