@duckduckgo/autoconsent 10.6.0 → 10.6.2

package/CHANGELOG.md

@@ -1,3 +1,30 @@
+# v10.6.2 (Tue Apr 23 2024)
+
+#### 🐛 Bug Fix
+
+- Click 'Save & Exit' instead of 'Cancel' in dmgmedia popup [#425](https://github.com/duckduckgo/autoconsent/pull/425) ([@sammacbeth](https://github.com/sammacbeth))
+- Fix sibbo rule [#423](https://github.com/duckduckgo/autoconsent/pull/423) ([@sammacbeth](https://github.com/sammacbeth))
+- Update readme.md [#420](https://github.com/duckduckgo/autoconsent/pull/420) ([@hyebahi](https://github.com/hyebahi))
+
+#### Authors: 2
+
+- [@hyebahi](https://github.com/hyebahi)
+- Sam Macbeth ([@sammacbeth](https://github.com/sammacbeth))
+
+---
+
+# v10.6.1 (Fri Apr 12 2024)
+
+#### 🐛 Bug Fix
+
+- Fix Klaro rule (wogibtswas.de, www.suedtirol.com) [#404](https://github.com/duckduckgo/autoconsent/pull/404) ([@sammacbeth](https://github.com/sammacbeth))
+
+#### Authors: 1
+
+- Sam Macbeth ([@sammacbeth](https://github.com/sammacbeth))
+
+---
+
 # v10.6.0 (Fri Apr 12 2024)
 
 #### 🚀 Enhancement

package/dist/addon-firefox/background.bundle.js

@@ -28,6 +28,22 @@
         return Object.keys(consents).filter((k) => optionalServices.includes(k)).every((k) => consents[k] === false);
       }
     },
+    EVAL_KLARO_OPEN_POPUP: () => {
+      klaro.show(void 0, true);
+    },
+    EVAL_KLARO_TRY_API_OPT_OUT: () => {
+      if (window.klaro && typeof klaro.show === "function" && typeof klaro.getManager === "function") {
+        try {
+          klaro.getManager().changeAll(false);
+          klaro.getManager().saveAndApplyConsents();
+          return true;
+        } catch (e) {
+          console.warn(e);
+          return false;
+        }
+      }
+      return false;
+    },
     EVAL_ONETRUST_1: () => window.OnetrustActiveGroups.split(",").filter((s) => s.length > 0).length <= 1,
     EVAL_TRUSTARC_TOP: () => window && window.truste && window.truste.eu.bindMap.prefCookie === "0",
     // declarative rules
@@ -97,7 +113,6 @@
     EVAL_PRIMEBOX_0: () => !document.cookie.includes("cb-enabled=accepted"),
     EVAL_PUBTECH_0: () => document.cookie.includes("euconsent-v2") && (document.cookie.match(/.YAAAAAAAAAAA/) || document.cookie.match(/.aAAAAAAAAAAA/) || document.cookie.match(/.YAAACFgAAAAA/)),
     EVAL_REDDIT_0: () => document.cookie.includes("eu_cookie={%22opted%22:true%2C%22nonessential%22:false}"),
-    EVAL_SIBBO_0: () => !!window.localStorage.getItem("euconsent-v2"),
     EVAL_SIRDATA_UNBLOCK_SCROLL: () => {
       document.documentElement.classList.forEach((cls) => {
         if (cls.startsWith("sd-cmp-"))

package/dist/addon-firefox/content.bundle.js

@@ -475,6 +475,22 @@
         return Object.keys(consents).filter((k) => optionalServices.includes(k)).every((k) => consents[k] === false);
       }
     },
+    EVAL_KLARO_OPEN_POPUP: () => {
+      klaro.show(void 0, true);
+    },
+    EVAL_KLARO_TRY_API_OPT_OUT: () => {
+      if (window.klaro && typeof klaro.show === "function" && typeof klaro.getManager === "function") {
+        try {
+          klaro.getManager().changeAll(false);
+          klaro.getManager().saveAndApplyConsents();
+          return true;
+        } catch (e) {
+          console.warn(e);
+          return false;
+        }
+      }
+      return false;
+    },
     EVAL_ONETRUST_1: () => window.OnetrustActiveGroups.split(",").filter((s) => s.length > 0).length <= 1,
     EVAL_TRUSTARC_TOP: () => window && window.truste && window.truste.eu.bindMap.prefCookie === "0",
     // declarative rules
@@ -544,7 +560,6 @@
     EVAL_PRIMEBOX_0: () => !document.cookie.includes("cb-enabled=accepted"),
     EVAL_PUBTECH_0: () => document.cookie.includes("euconsent-v2") && (document.cookie.match(/.YAAAAAAAAAAA/) || document.cookie.match(/.aAAAAAAAAAAA/) || document.cookie.match(/.YAAACFgAAAAA/)),
     EVAL_REDDIT_0: () => document.cookie.includes("eu_cookie={%22opted%22:true%2C%22nonessential%22:false}"),
-    EVAL_SIBBO_0: () => !!window.localStorage.getItem("euconsent-v2"),
     EVAL_SIRDATA_UNBLOCK_SCROLL: () => {
       document.documentElement.classList.forEach((cls) => {
         if (cls.startsWith("sd-cmp-"))
@@ -1499,14 +1514,14 @@
       return this.elementVisible(".klaro > .cookie-notice,.klaro > .cookie-modal", "any");
     }
     async optOut() {
-      if (this.click(".klaro .cn-decline")) {
+      const apiOptOutSuccess = await this.mainWorldEval("EVAL_KLARO_TRY_API_OPT_OUT");
+      if (apiOptOutSuccess) {
         return true;
       }
-      if (!this.settingsOpen) {
-        this.click(".klaro .cn-learn-more,.klaro .cm-button-manage");
-        await this.waitForElement(".klaro > .cookie-modal", 2e3);
-        this.settingsOpen = true;
+      if (this.click(".klaro .cn-decline")) {
+        return true;
       }
+      await this.mainWorldEval("EVAL_KLARO_OPEN_POPUP");
       if (this.click(".klaro .cn-decline")) {
         return true;
       }

package/dist/addon-firefox/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Autoconsent",
-  "version": "2024.4.2",
+  "version": "2024.4.12",
   "background": {
     "scripts": [
       "background.bundle.js"

package/dist/addon-firefox/rules.json

@@ -2391,7 +2391,10 @@
           "all": true
         },
         {
-          "waitForThenClick": "[data-project=\"mol-fe-cmp\"] button[class*=white]"
+          "waitForThenClick": [
+            "[data-project=\"mol-fe-cmp\"] [class*=footer]",
+            "xpath///button[contains(., 'Save & Exit')]"
+          ]
         }
       ]
     },
@@ -5265,48 +5268,17 @@
       ],
       "detectPopup": [
         {
-          "visible": "sibbo-cmp-layout"
+          "visible": "#rejectAllMain"
         }
       ],
       "optIn": [
         {
-          "click": "sibbo-cmp-layout [data-accept-all]"
+          "click": "#acceptAllMain"
         }
       ],
       "optOut": [
         {
-          "click": ".sibbo-panel__aside__buttons a[data-nav=\"purposes\"]"
-        },
-        {
-          "click": ".sibbo-panel__main__header__actions a[data-focusable=\"reject-all\"]"
-        },
-        {
-          "if": {
-            "exists": "[data-view=purposes] .sibbo-panel__main__footer__actions [data-save-and-exit]"
-          },
-          "then": [],
-          "else": [
-            {
-              "waitFor": ".sibbo-panel__main__footer__actions a[data-focusable=\"next\"]:not(.sibbo-cmp-button--disabled)"
-            },
-            {
-              "click": ".sibbo-panel__main__footer__actions a[data-focusable=\"next\"]"
-            },
-            {
-              "click": ".sibbo-panel__main div[data-view=\"purposesLegInt\"] a[data-focusable=\"reject-all\"]"
-            }
-          ]
-        },
-        {
-          "waitFor": ".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"
-        },
-        {
-          "click": ".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"
-        }
-      ],
-      "test": [
-        {
-          "eval": "EVAL_SIBBO_0"
+          "click": "#rejectAllMain"
         }
       ]
     },

package/dist/addon-mv3/background.bundle.js

@@ -28,6 +28,22 @@
         return Object.keys(consents).filter((k) => optionalServices.includes(k)).every((k) => consents[k] === false);
       }
     },
+    EVAL_KLARO_OPEN_POPUP: () => {
+      klaro.show(void 0, true);
+    },
+    EVAL_KLARO_TRY_API_OPT_OUT: () => {
+      if (window.klaro && typeof klaro.show === "function" && typeof klaro.getManager === "function") {
+        try {
+          klaro.getManager().changeAll(false);
+          klaro.getManager().saveAndApplyConsents();
+          return true;
+        } catch (e) {
+          console.warn(e);
+          return false;
+        }
+      }
+      return false;
+    },
     EVAL_ONETRUST_1: () => window.OnetrustActiveGroups.split(",").filter((s) => s.length > 0).length <= 1,
     EVAL_TRUSTARC_TOP: () => window && window.truste && window.truste.eu.bindMap.prefCookie === "0",
     // declarative rules
@@ -97,7 +113,6 @@
     EVAL_PRIMEBOX_0: () => !document.cookie.includes("cb-enabled=accepted"),
     EVAL_PUBTECH_0: () => document.cookie.includes("euconsent-v2") && (document.cookie.match(/.YAAAAAAAAAAA/) || document.cookie.match(/.aAAAAAAAAAAA/) || document.cookie.match(/.YAAACFgAAAAA/)),
     EVAL_REDDIT_0: () => document.cookie.includes("eu_cookie={%22opted%22:true%2C%22nonessential%22:false}"),
-    EVAL_SIBBO_0: () => !!window.localStorage.getItem("euconsent-v2"),
     EVAL_SIRDATA_UNBLOCK_SCROLL: () => {
       document.documentElement.classList.forEach((cls) => {
         if (cls.startsWith("sd-cmp-"))

package/dist/addon-mv3/content.bundle.js

@@ -475,6 +475,22 @@
         return Object.keys(consents).filter((k) => optionalServices.includes(k)).every((k) => consents[k] === false);
       }
     },
+    EVAL_KLARO_OPEN_POPUP: () => {
+      klaro.show(void 0, true);
+    },
+    EVAL_KLARO_TRY_API_OPT_OUT: () => {
+      if (window.klaro && typeof klaro.show === "function" && typeof klaro.getManager === "function") {
+        try {
+          klaro.getManager().changeAll(false);
+          klaro.getManager().saveAndApplyConsents();
+          return true;
+        } catch (e) {
+          console.warn(e);
+          return false;
+        }
+      }
+      return false;
+    },
     EVAL_ONETRUST_1: () => window.OnetrustActiveGroups.split(",").filter((s) => s.length > 0).length <= 1,
     EVAL_TRUSTARC_TOP: () => window && window.truste && window.truste.eu.bindMap.prefCookie === "0",
     // declarative rules
@@ -544,7 +560,6 @@
     EVAL_PRIMEBOX_0: () => !document.cookie.includes("cb-enabled=accepted"),
     EVAL_PUBTECH_0: () => document.cookie.includes("euconsent-v2") && (document.cookie.match(/.YAAAAAAAAAAA/) || document.cookie.match(/.aAAAAAAAAAAA/) || document.cookie.match(/.YAAACFgAAAAA/)),
     EVAL_REDDIT_0: () => document.cookie.includes("eu_cookie={%22opted%22:true%2C%22nonessential%22:false}"),
-    EVAL_SIBBO_0: () => !!window.localStorage.getItem("euconsent-v2"),
     EVAL_SIRDATA_UNBLOCK_SCROLL: () => {
       document.documentElement.classList.forEach((cls) => {
         if (cls.startsWith("sd-cmp-"))
@@ -1499,14 +1514,14 @@
       return this.elementVisible(".klaro > .cookie-notice,.klaro > .cookie-modal", "any");
     }
     async optOut() {
-      if (this.click(".klaro .cn-decline")) {
+      const apiOptOutSuccess = await this.mainWorldEval("EVAL_KLARO_TRY_API_OPT_OUT");
+      if (apiOptOutSuccess) {
         return true;
       }
-      if (!this.settingsOpen) {
-        this.click(".klaro .cn-learn-more,.klaro .cm-button-manage");
-        await this.waitForElement(".klaro > .cookie-modal", 2e3);
-        this.settingsOpen = true;
+      if (this.click(".klaro .cn-decline")) {
+        return true;
       }
+      await this.mainWorldEval("EVAL_KLARO_OPEN_POPUP");
       if (this.click(".klaro .cn-decline")) {
         return true;
       }

package/dist/addon-mv3/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Autoconsent",
-  "version": "2024.4.2",
+  "version": "2024.4.12",
   "background": {
     "service_worker": "background.bundle.js"
   },

package/dist/addon-mv3/rules.json

@@ -2391,7 +2391,10 @@
           "all": true
         },
         {
-          "waitForThenClick": "[data-project=\"mol-fe-cmp\"] button[class*=white]"
+          "waitForThenClick": [
+            "[data-project=\"mol-fe-cmp\"] [class*=footer]",
+            "xpath///button[contains(., 'Save & Exit')]"
+          ]
         }
       ]
     },
@@ -5265,48 +5268,17 @@
       ],
       "detectPopup": [
         {
-          "visible": "sibbo-cmp-layout"
+          "visible": "#rejectAllMain"
         }
       ],
       "optIn": [
         {
-          "click": "sibbo-cmp-layout [data-accept-all]"
+          "click": "#acceptAllMain"
         }
       ],
       "optOut": [
         {
-          "click": ".sibbo-panel__aside__buttons a[data-nav=\"purposes\"]"
-        },
-        {
-          "click": ".sibbo-panel__main__header__actions a[data-focusable=\"reject-all\"]"
-        },
-        {
-          "if": {
-            "exists": "[data-view=purposes] .sibbo-panel__main__footer__actions [data-save-and-exit]"
-          },
-          "then": [],
-          "else": [
-            {
-              "waitFor": ".sibbo-panel__main__footer__actions a[data-focusable=\"next\"]:not(.sibbo-cmp-button--disabled)"
-            },
-            {
-              "click": ".sibbo-panel__main__footer__actions a[data-focusable=\"next\"]"
-            },
-            {
-              "click": ".sibbo-panel__main div[data-view=\"purposesLegInt\"] a[data-focusable=\"reject-all\"]"
-            }
-          ]
-        },
-        {
-          "waitFor": ".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"
-        },
-        {
-          "click": ".sibbo-panel__main__footer__actions [data-save-and-exit]:not(.sibbo-cmp-button--disabled)"
-        }
-      ],
-      "test": [
-        {
-          "eval": "EVAL_SIBBO_0"
+          "click": "#rejectAllMain"
         }
       ]
     },

package/dist/autoconsent.cjs.js

@@ -498,6 +498,22 @@ var snippets = {
       return Object.keys(consents).filter((k) => optionalServices.includes(k)).every((k) => consents[k] === false);
     }
   },
+  EVAL_KLARO_OPEN_POPUP: () => {
+    klaro.show(void 0, true);
+  },
+  EVAL_KLARO_TRY_API_OPT_OUT: () => {
+    if (window.klaro && typeof klaro.show === "function" && typeof klaro.getManager === "function") {
+      try {
+        klaro.getManager().changeAll(false);
+        klaro.getManager().saveAndApplyConsents();
+        return true;
+      } catch (e) {
+        console.warn(e);
+        return false;
+      }
+    }
+    return false;
+  },
   EVAL_ONETRUST_1: () => window.OnetrustActiveGroups.split(",").filter((s) => s.length > 0).length <= 1,
   EVAL_TRUSTARC_TOP: () => window && window.truste && window.truste.eu.bindMap.prefCookie === "0",
   // declarative rules
@@ -567,7 +583,6 @@ var snippets = {
   EVAL_PRIMEBOX_0: () => !document.cookie.includes("cb-enabled=accepted"),
   EVAL_PUBTECH_0: () => document.cookie.includes("euconsent-v2") && (document.cookie.match(/.YAAAAAAAAAAA/) || document.cookie.match(/.aAAAAAAAAAAA/) || document.cookie.match(/.YAAACFgAAAAA/)),
   EVAL_REDDIT_0: () => document.cookie.includes("eu_cookie={%22opted%22:true%2C%22nonessential%22:false}"),
-  EVAL_SIBBO_0: () => !!window.localStorage.getItem("euconsent-v2"),
   EVAL_SIRDATA_UNBLOCK_SCROLL: () => {
     document.documentElement.classList.forEach((cls) => {
       if (cls.startsWith("sd-cmp-"))
@@ -1522,14 +1537,14 @@ var Klaro = class extends AutoConsentCMPBase {
     return this.elementVisible(".klaro > .cookie-notice,.klaro > .cookie-modal", "any");
   }
   async optOut() {
-    if (this.click(".klaro .cn-decline")) {
+    const apiOptOutSuccess = await this.mainWorldEval("EVAL_KLARO_TRY_API_OPT_OUT");
+    if (apiOptOutSuccess) {
       return true;
     }
-    if (!this.settingsOpen) {
-      this.click(".klaro .cn-learn-more,.klaro .cm-button-manage");
-      await this.waitForElement(".klaro > .cookie-modal", 2e3);
-      this.settingsOpen = true;
+    if (this.click(".klaro .cn-decline")) {
+      return true;
     }
+    await this.mainWorldEval("EVAL_KLARO_OPEN_POPUP");
     if (this.click(".klaro .cn-decline")) {
       return true;
     }

package/dist/autoconsent.esm.js

@@ -473,6 +473,22 @@ var snippets = {
       return Object.keys(consents).filter((k) => optionalServices.includes(k)).every((k) => consents[k] === false);
     }
   },
+  EVAL_KLARO_OPEN_POPUP: () => {
+    klaro.show(void 0, true);
+  },
+  EVAL_KLARO_TRY_API_OPT_OUT: () => {
+    if (window.klaro && typeof klaro.show === "function" && typeof klaro.getManager === "function") {
+      try {
+        klaro.getManager().changeAll(false);
+        klaro.getManager().saveAndApplyConsents();
+        return true;
+      } catch (e) {
+        console.warn(e);
+        return false;
+      }
+    }
+    return false;
+  },
   EVAL_ONETRUST_1: () => window.OnetrustActiveGroups.split(",").filter((s) => s.length > 0).length <= 1,
   EVAL_TRUSTARC_TOP: () => window && window.truste && window.truste.eu.bindMap.prefCookie === "0",
   // declarative rules
@@ -542,7 +558,6 @@ var snippets = {
   EVAL_PRIMEBOX_0: () => !document.cookie.includes("cb-enabled=accepted"),
   EVAL_PUBTECH_0: () => document.cookie.includes("euconsent-v2") && (document.cookie.match(/.YAAAAAAAAAAA/) || document.cookie.match(/.aAAAAAAAAAAA/) || document.cookie.match(/.YAAACFgAAAAA/)),
   EVAL_REDDIT_0: () => document.cookie.includes("eu_cookie={%22opted%22:true%2C%22nonessential%22:false}"),
-  EVAL_SIBBO_0: () => !!window.localStorage.getItem("euconsent-v2"),
   EVAL_SIRDATA_UNBLOCK_SCROLL: () => {
     document.documentElement.classList.forEach((cls) => {
       if (cls.startsWith("sd-cmp-"))
@@ -1497,14 +1512,14 @@ var Klaro = class extends AutoConsentCMPBase {
     return this.elementVisible(".klaro > .cookie-notice,.klaro > .cookie-modal", "any");
   }
   async optOut() {
-    if (this.click(".klaro .cn-decline")) {
+    const apiOptOutSuccess = await this.mainWorldEval("EVAL_KLARO_TRY_API_OPT_OUT");
+    if (apiOptOutSuccess) {
       return true;
     }
-    if (!this.settingsOpen) {
-      this.click(".klaro .cn-learn-more,.klaro .cm-button-manage");
-      await this.waitForElement(".klaro > .cookie-modal", 2e3);
-      this.settingsOpen = true;
+    if (this.click(".klaro .cn-decline")) {
+      return true;
     }
+    await this.mainWorldEval("EVAL_KLARO_OPEN_POPUP");
     if (this.click(".klaro .cn-decline")) {
       return true;
     }