chefcookie 2.5.4 → 2.5.7

package/README.md

@@ -82,6 +82,7 @@ const cc = new chefcookie({
     expiration: 7, // in days
     cookie_prefix: 'cc_', // switch cookie prefix (e.g. for different pages on the same top level domain)
     exclude_ua_regex: /(Speed Insights|Chrome-Lighthouse|PSTS[\d\.]+)/,
+    //domain: undefined,
     style: {
         layout: 'overlay', // overlay|bottombar|topbar
         size: 3, // 1|2|3|4|5
@@ -415,6 +416,9 @@ this only gets executed when you call `resolve()` inside your custom tracking fu
 the cookie banner is shown always, if no consent is saved.\
 if done so, it is shown again, after the cookie expired (see the `expiration`-setting).
 
+cookies are valid by default for the 2nd level domain of the site. e.g if the banner is on www.foo.bar, the cookie domain will be foo.bar, so the user's choices will be valid for www.foo.bar, xxx.foo.bar, ...\
+there is an option to customize the domain using the `domain`-settings. setting the domain to `undefined` means using cookies only for the current site.
+
 it is recommended to include a (re)opening link in the privacy policy, for example.\
 here you can also use the following code:
 

package/_build/_helper.js

@@ -17,48 +17,6 @@ var helper = /*#__PURE__*/function () {
   }
 
   (0, _createClass2.default)(helper, null, [{
-    key: "cookieExists",
-    value: function cookieExists(cookie_name) {
-      if (document.cookie !== undefined && this.cookieGet(cookie_name) !== null) {
-        return true;
-      }
-
-      return false;
-    }
-  }, {
-    key: "cookieGet",
-    value: function cookieGet(cookie_name) {
-      var cookie_match = document.cookie.match(new RegExp(cookie_name + '=([^;]+)'));
-
-      if (cookie_match) {
-        return cookie_match[1];
-      }
-
-      return null;
-    }
-  }, {
-    key: "cookieSet",
-    value: function cookieSet(cookie_name, cookie_value, days) {
-      var samesite = '';
-
-      if (window.location.protocol.indexOf('https') > -1) {
-        samesite = '; SameSite=None; Secure';
-      }
-
-      document.cookie = cookie_name + '=' + cookie_value + '; ' + 'expires=' + new Date(new Date().getTime() + days * 24 * 60 * 60 * 1000).toUTCString() + '; path=/' + samesite + '; domain=' + this.urlHostTopLevel();
-    }
-  }, {
-    key: "cookieDelete",
-    value: function cookieDelete(cookie_name) {
-      var samesite = '';
-
-      if (window.location.protocol.indexOf('https') > -1) {
-        samesite = '; SameSite=None; Secure';
-      }
-
-      document.cookie = cookie_name + '=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/' + samesite + '; domain=' + this.urlHostTopLevel();
-    }
-  }, {
     key: "getParam",
     value: function getParam(variable) {
       var url = window.location.search;
@@ -83,7 +41,12 @@ var helper = /*#__PURE__*/function () {
   }, {
     key: "urlHostTopLevel",
     value: function urlHostTopLevel() {
-      var host = window.location.hostname;
+      var host = window.location.hostname; // ipv4
+
+      if (host.match(/^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$/)) {
+        return host;
+      }
+
       host = host.split('.');
 
       while (host.length > 2) {

package/_build/script.js

@@ -31,6 +31,8 @@ require("@babel/polyfill/noConflict");
 
 var _helper = _interopRequireDefault(require("./_helper"));
 
+var _cookie = _interopRequireDefault(require("cookie"));
+
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -40,10 +42,10 @@ var chefcookie = /*#__PURE__*/function () {
     var config = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     (0, _classCallCheck2.default)(this, chefcookie);
     var defaults = {
-      exclude_ua_regex: /(Speed Insights|Chrome-Lighthouse|PSTS[\d\.]+)/
+      exclude_ua_regex: /(Speed Insights|Chrome-Lighthouse|PSTS[\d\.]+)/,
+      domain: _helper.default.urlHostTopLevel()
     };
-    this.config = _objectSpread(_objectSpread({}, defaults), config);
-    console.log(this.config); // add dummy entries for empty groups
+    this.config = _objectSpread(_objectSpread({}, defaults), config); // add dummy entries for empty groups
 
     this.config.settings.forEach(function (group, i) {
       if (!('scripts' in group) || Object.keys(group.scripts).length === 0) {
@@ -634,6 +636,44 @@ var chefcookie = /*#__PURE__*/function () {
         el.checked = false;
       });
     }
+  }, {
+    key: "getCookieExpiration",
+    value: function getCookieExpiration() {
+      var expiration = 30;
+
+      if ('expiration' in this.config && Number.isInteger(this.config.expiration)) {
+        expiration = this.config.expiration;
+      }
+
+      return expiration;
+    }
+  }, {
+    key: "getCookieName",
+    value: function getCookieName(cookieName) {
+      return (this.config.cookie_prefix || 'cc_') + cookieName;
+    }
+  }, {
+    key: "setCookie",
+    value: function setCookie(name, value) {
+      var cookie_name = this.getCookieName(name);
+      var days = this.getCookieExpiration();
+      var cookie_domain = this.config.domain;
+      var options = window.location.protocol.indexOf('https') > -1 ? {
+        secure: true,
+        samesite: 'None'
+      } : {};
+      document.cookie = _cookie.default.serialize(cookie_name, value, _objectSpread({
+        httpOnly: false,
+        maxAge: 60 * 60 * 24 * days,
+        domain: cookie_domain && window.location.hostname.endsWith(cookie_domain) ? cookie_domain : undefined
+      }, options));
+    }
+  }, {
+    key: "getCookie",
+    value: function getCookie(name) {
+      var cookie_name = this.getCookieName(name);
+      return _cookie.default.parse(document.cookie)[cookie_name];
+    }
   }, {
     key: "isCheckboxActiveForGroup",
     value: function isCheckboxActiveForGroup(group_index) {
@@ -696,12 +736,12 @@ var chefcookie = /*#__PURE__*/function () {
   }, {
     key: "setCookieToHideOverlay",
     value: function setCookieToHideOverlay() {
-      _helper.default.cookieSet(this.getCookieName('hide_prompt'), '1', this.getCookieExpiration());
+      this.setCookie('hide_prompt', '1');
     }
   }, {
     key: "isCookieSetToHideOverlay",
     value: function isCookieSetToHideOverlay() {
-      return _helper.default.cookieExists(this.getCookieName('hide_prompt'));
+      return this.getCookie('hide_prompt') !== undefined;
     }
   }, {
     key: "saveInCookie",
@@ -737,34 +777,32 @@ var chefcookie = /*#__PURE__*/function () {
         providers.push('null');
       }
 
-      _helper.default.cookieSet(this.getCookieName('accepted_providers'), providers.join(','), this.getCookieExpiration());
+      this.setCookie('accepted_providers', providers.join(','));
     }
   }, {
     key: "addToCookie",
     value: function addToCookie(provider) {
       var providers;
 
-      if (!_helper.default.cookieExists(this.getCookieName('accepted_providers')) || _helper.default.cookieGet(this.getCookieName('accepted_providers')) === 'null') {
+      if (this.getCookie('accepted_providers') === undefined || this.getCookie('accepted_providers') === 'null') {
         providers = [];
       } else {
-        providers = _helper.default.cookieGet(this.getCookieName('accepted_providers')).split(',');
+        providers = this.getCookie('accepted_providers').split(',');
       }
 
       if (providers.indexOf(provider) === -1) {
         providers.push(provider);
-
-        _helper.default.cookieSet(this.getCookieName('accepted_providers'), providers.join(','), this.getCookieExpiration());
+        this.setCookie('accepted_providers', providers.join(','));
       }
     }
   }, {
     key: "deleteFromCookie",
     value: function deleteFromCookie(provider) {
-      if (!_helper.default.cookieExists(this.getCookieName('accepted_providers'))) {
+      if (this.getCookie('accepted_providers') === undefined) {
         return;
       }
 
-      var providers = _helper.default.cookieGet(this.getCookieName('accepted_providers')).split(',');
-
+      var providers = this.getCookie('accepted_providers').split(',');
       var index = providers.indexOf(provider);
 
       if (index !== -1) {
@@ -772,26 +810,10 @@ var chefcookie = /*#__PURE__*/function () {
       }
 
       if (providers.length > 0) {
-        _helper.default.cookieSet(this.getCookieName('accepted_providers'), providers.join(','), this.getCookieExpiration());
+        this.setCookie('accepted_providers', providers.join(','));
       } else {
-        _helper.default.cookieSet(this.getCookieName('accepted_providers'), 'null', this.getCookieExpiration());
-      }
-    }
-  }, {
-    key: "getCookieExpiration",
-    value: function getCookieExpiration() {
-      var expiration = 30;
-
-      if ('expiration' in this.config && Number.isInteger(this.config.expiration)) {
-        expiration = this.config.expiration;
+        this.setCookie('accepted_providers', 'null');
       }
-
-      return expiration;
-    }
-  }, {
-    key: "getCookieName",
-    value: function getCookieName(cookieName) {
-      return (this.config.cookie_prefix || 'cc_') + cookieName;
     }
   }, {
     key: "addEnabledScripts",
@@ -800,11 +822,11 @@ var chefcookie = /*#__PURE__*/function () {
 
       var isInit = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
 
-      if (!_helper.default.cookieExists(this.getCookieName('accepted_providers'))) {
+      if (this.getCookie('accepted_providers') === undefined) {
         return;
       }
 
-      var settings = _helper.default.cookieGet(this.getCookieName('accepted_providers'));
+      var settings = this.getCookie('accepted_providers');
 
       if (settings == 'null') {
         return;
@@ -839,17 +861,16 @@ var chefcookie = /*#__PURE__*/function () {
 
       var isInit = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
 
-      if (!_helper.default.cookieExists(this.getCookieName('accepted_providers'))) {
+      if (this.getCookie('accepted_providers') === undefined) {
         return;
       }
 
-      var settings = _helper.default.cookieGet(this.getCookieName('accepted_providers'));
+      var settings = this.getCookie('accepted_providers').split(',');
 
-      if (settings == 'null') {
+      if (settings === ['null']) {
         return;
       }
 
-      settings = settings.split(',');
       this.config.settings.forEach(function (settings__value) {
         if (settings__value.scripts !== undefined) {
           Object.entries(settings__value.scripts).forEach(function (_ref6) {
@@ -1092,11 +1113,11 @@ var chefcookie = /*#__PURE__*/function () {
   }, {
     key: "isAccepted",
     value: function isAccepted(provider) {
-      if (!_helper.default.cookieExists(this.getCookieName('accepted_providers'))) {
+      if (this.getCookie('accepted_providers') === undefined) {
         return false;
       }
 
-      return _helper.default.cookieGet(this.getCookieName('accepted_providers')).split(',').indexOf(provider) > -1;
+      return this.getCookie('accepted_providers').split(',').indexOf(provider) > -1;
     }
   }, {
     key: "isLoaded",