@duckduckgo/autoconsent 6.4.2 → 6.4.3

package/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v6.4.3 (Mon Dec 04 2023)
+
+#### 🐛 Bug Fix
+
+- Cookiebot fixes [#304](https://github.com/duckduckgo/autoconsent/pull/304) ([@muodov](https://github.com/muodov))
+
+#### Authors: 1
+
+- Maxim Tsoy ([@muodov](https://github.com/muodov))
+
+---
+
 # v6.4.2 (Mon Dec 04 2023)
 
 #### 🐛 Bug Fix

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

@@ -220,6 +220,7 @@
           }
           break;
         case "selfTestResult":
+          enableLogs && console.log(`Self-test result ${msg.result}`);
           if (msg.result) {
             await showOptOutStatus(tabId, "verified", msg.cmp);
           }

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

@@ -631,10 +631,11 @@
     EVAL_CONSENTMANAGER_3: () => __cmp("setConsent", 0),
     EVAL_CONSENTMANAGER_4: () => __cmp("setConsent", 1),
     EVAL_CONSENTMANAGER_5: () => __cmp("consentStatus").userChoiceExists,
-    EVAL_COOKIEBOT_1: () => window.CookieConsent.hasResponse !== true,
-    EVAL_COOKIEBOT_2: () => window.Cookiebot.dialog.submitConsent(),
-    EVAL_COOKIEBOT_3: () => endCookieProcess(),
-    EVAL_COOKIEBOT_4: () => window.CookieConsent.declined === true,
+    EVAL_COOKIEBOT_1: () => !!window.Cookiebot,
+    EVAL_COOKIEBOT_2: () => !window.Cookiebot.hasResponse && window.Cookiebot.dialog?.visible === true,
+    EVAL_COOKIEBOT_3: () => window.Cookiebot.withdraw() || true,
+    EVAL_COOKIEBOT_4: () => window.Cookiebot.hide() || true,
+    EVAL_COOKIEBOT_5: () => window.Cookiebot.declined === true,
     EVAL_KLARO_1: () => klaro.getManager().config.services.every((c) => c.required || !klaro.getManager().consents[c.name]),
     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",
@@ -773,6 +774,7 @@
         return Promise.resolve(result);
       }
       const snippetSrc = getFunctionBody(snippet);
+      enableLogs && console.log("async eval:", snippetId, snippetSrc);
       return requestEval(snippetSrc).catch((e) => {
         enableLogs && console.error("error evaluating rule", snippetId, e);
         return false;
@@ -1176,7 +1178,7 @@
     constructor() {
       super(...arguments);
       this.name = "Cybotcookiebot";
-      this.prehideSelectors = ["#CybotCookiebotDialog,#dtcookie-container,#cookiebanner,#cb-cookieoverlay"];
+      this.prehideSelectors = ["#CybotCookiebotDialog,#CybotCookiebotDialogBodyUnderlay,#dtcookie-container,#cookiebanner,#cb-cookieoverlay,.modal--cookie-banner,#cookiebanner_outer,#CookieBanner"];
     }
     get hasSelfTest() {
       return true;
@@ -1188,44 +1190,19 @@
       return false;
     }
     async detectCmp() {
-      return elementExists("#CybotCookiebotDialogBodyLevelButtonPreferences");
+      return await this.mainWorldEval("EVAL_COOKIEBOT_1");
     }
     async detectPopup() {
-      return elementExists("#CybotCookiebotDialog,#dtcookie-container,#cookiebanner,#cb-cookiebanner");
+      return await waitFor(() => {
+        return this.mainWorldEval("EVAL_COOKIEBOT_2");
+      }, 10, 500);
     }
     async optOut() {
-      if (click(".cookie-alert-extended-detail-link")) {
-        await waitForElement(".cookie-alert-configuration", 2e3);
-        click(".cookie-alert-configuration-input:checked", true);
-        click(".cookie-alert-extended-button-secondary");
-        return true;
-      }
-      if (elementExists("#dtcookie-container")) {
-        return click(".h-dtcookie-decline");
-      }
-      if (click(".cookiebot__button--settings")) {
-        return true;
-      }
-      if (click("#CybotCookiebotDialogBodyButtonDecline")) {
-        return true;
-      }
-      click(".cookiebanner__link--details");
-      click('.CybotCookiebotDialogBodyLevelButton:checked:enabled,input[id*="CybotCookiebotDialogBodyLevelButton"]:checked:enabled', true);
-      click("#CybotCookiebotDialogBodyButtonDecline");
-      click("input[id^=CybotCookiebotDialogBodyLevelButton]:checked", true);
-      if (elementExists("#CybotCookiebotDialogBodyButtonAcceptSelected")) {
-        click("#CybotCookiebotDialogBodyButtonAcceptSelected");
-      } else {
-        click("#CybotCookiebotDialogBodyLevelButtonAccept,#CybotCookiebotDialogBodyButtonAccept,#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowallSelection", true);
-      }
-      if (await this.mainWorldEval("EVAL_COOKIEBOT_1")) {
-        await this.mainWorldEval("EVAL_COOKIEBOT_2");
-        await wait(500);
-      }
-      if (elementExists("#cb-confirmedSettings")) {
-        await this.mainWorldEval("EVAL_COOKIEBOT_3");
-      }
-      return true;
+      await wait(500);
+      let res = await this.mainWorldEval("EVAL_COOKIEBOT_3");
+      await wait(500);
+      res = res && await this.mainWorldEval("EVAL_COOKIEBOT_4");
+      return res;
     }
     async optIn() {
       if (elementExists("#dtcookie-container")) {
@@ -1237,7 +1214,8 @@
       return true;
     }
     async test() {
-      return this.mainWorldEval("EVAL_COOKIEBOT_4");
+      await wait(500);
+      return await this.mainWorldEval("EVAL_COOKIEBOT_5");
     }
   };
 

package/dist/addon-firefox/manifest.json

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

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

@@ -220,6 +220,7 @@
           }
           break;
         case "selfTestResult":
+          enableLogs && console.log(`Self-test result ${msg.result}`);
           if (msg.result) {
             await showOptOutStatus(tabId, "verified", msg.cmp);
           }

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

@@ -631,10 +631,11 @@
     EVAL_CONSENTMANAGER_3: () => __cmp("setConsent", 0),
     EVAL_CONSENTMANAGER_4: () => __cmp("setConsent", 1),
     EVAL_CONSENTMANAGER_5: () => __cmp("consentStatus").userChoiceExists,
-    EVAL_COOKIEBOT_1: () => window.CookieConsent.hasResponse !== true,
-    EVAL_COOKIEBOT_2: () => window.Cookiebot.dialog.submitConsent(),
-    EVAL_COOKIEBOT_3: () => endCookieProcess(),
-    EVAL_COOKIEBOT_4: () => window.CookieConsent.declined === true,
+    EVAL_COOKIEBOT_1: () => !!window.Cookiebot,
+    EVAL_COOKIEBOT_2: () => !window.Cookiebot.hasResponse && window.Cookiebot.dialog?.visible === true,
+    EVAL_COOKIEBOT_3: () => window.Cookiebot.withdraw() || true,
+    EVAL_COOKIEBOT_4: () => window.Cookiebot.hide() || true,
+    EVAL_COOKIEBOT_5: () => window.Cookiebot.declined === true,
     EVAL_KLARO_1: () => klaro.getManager().config.services.every((c) => c.required || !klaro.getManager().consents[c.name]),
     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",
@@ -773,6 +774,7 @@
         return Promise.resolve(result);
       }
       const snippetSrc = getFunctionBody(snippet);
+      enableLogs && console.log("async eval:", snippetId, snippetSrc);
       return requestEval(snippetSrc).catch((e) => {
         enableLogs && console.error("error evaluating rule", snippetId, e);
         return false;
@@ -1176,7 +1178,7 @@
     constructor() {
       super(...arguments);
       this.name = "Cybotcookiebot";
-      this.prehideSelectors = ["#CybotCookiebotDialog,#dtcookie-container,#cookiebanner,#cb-cookieoverlay"];
+      this.prehideSelectors = ["#CybotCookiebotDialog,#CybotCookiebotDialogBodyUnderlay,#dtcookie-container,#cookiebanner,#cb-cookieoverlay,.modal--cookie-banner,#cookiebanner_outer,#CookieBanner"];
     }
     get hasSelfTest() {
       return true;
@@ -1188,44 +1190,19 @@
       return false;
     }
     async detectCmp() {
-      return elementExists("#CybotCookiebotDialogBodyLevelButtonPreferences");
+      return await this.mainWorldEval("EVAL_COOKIEBOT_1");
     }
     async detectPopup() {
-      return elementExists("#CybotCookiebotDialog,#dtcookie-container,#cookiebanner,#cb-cookiebanner");
+      return await waitFor(() => {
+        return this.mainWorldEval("EVAL_COOKIEBOT_2");
+      }, 10, 500);
     }
     async optOut() {
-      if (click(".cookie-alert-extended-detail-link")) {
-        await waitForElement(".cookie-alert-configuration", 2e3);
-        click(".cookie-alert-configuration-input:checked", true);
-        click(".cookie-alert-extended-button-secondary");
-        return true;
-      }
-      if (elementExists("#dtcookie-container")) {
-        return click(".h-dtcookie-decline");
-      }
-      if (click(".cookiebot__button--settings")) {
-        return true;
-      }
-      if (click("#CybotCookiebotDialogBodyButtonDecline")) {
-        return true;
-      }
-      click(".cookiebanner__link--details");
-      click('.CybotCookiebotDialogBodyLevelButton:checked:enabled,input[id*="CybotCookiebotDialogBodyLevelButton"]:checked:enabled', true);
-      click("#CybotCookiebotDialogBodyButtonDecline");
-      click("input[id^=CybotCookiebotDialogBodyLevelButton]:checked", true);
-      if (elementExists("#CybotCookiebotDialogBodyButtonAcceptSelected")) {
-        click("#CybotCookiebotDialogBodyButtonAcceptSelected");
-      } else {
-        click("#CybotCookiebotDialogBodyLevelButtonAccept,#CybotCookiebotDialogBodyButtonAccept,#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowallSelection", true);
-      }
-      if (await this.mainWorldEval("EVAL_COOKIEBOT_1")) {
-        await this.mainWorldEval("EVAL_COOKIEBOT_2");
-        await wait(500);
-      }
-      if (elementExists("#cb-confirmedSettings")) {
-        await this.mainWorldEval("EVAL_COOKIEBOT_3");
-      }
-      return true;
+      await wait(500);
+      let res = await this.mainWorldEval("EVAL_COOKIEBOT_3");
+      await wait(500);
+      res = res && await this.mainWorldEval("EVAL_COOKIEBOT_4");
+      return res;
     }
     async optIn() {
       if (elementExists("#dtcookie-container")) {
@@ -1237,7 +1214,8 @@
       return true;
     }
     async test() {
-      return this.mainWorldEval("EVAL_COOKIEBOT_4");
+      await wait(500);
+      return await this.mainWorldEval("EVAL_COOKIEBOT_5");
     }
   };
 

package/dist/addon-mv3/manifest.json

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

package/dist/autoconsent.cjs.js

@@ -654,10 +654,11 @@ var snippets = {
   EVAL_CONSENTMANAGER_3: () => __cmp("setConsent", 0),
   EVAL_CONSENTMANAGER_4: () => __cmp("setConsent", 1),
   EVAL_CONSENTMANAGER_5: () => __cmp("consentStatus").userChoiceExists,
-  EVAL_COOKIEBOT_1: () => window.CookieConsent.hasResponse !== true,
-  EVAL_COOKIEBOT_2: () => window.Cookiebot.dialog.submitConsent(),
-  EVAL_COOKIEBOT_3: () => endCookieProcess(),
-  EVAL_COOKIEBOT_4: () => window.CookieConsent.declined === true,
+  EVAL_COOKIEBOT_1: () => !!window.Cookiebot,
+  EVAL_COOKIEBOT_2: () => !window.Cookiebot.hasResponse && window.Cookiebot.dialog?.visible === true,
+  EVAL_COOKIEBOT_3: () => window.Cookiebot.withdraw() || true,
+  EVAL_COOKIEBOT_4: () => window.Cookiebot.hide() || true,
+  EVAL_COOKIEBOT_5: () => window.Cookiebot.declined === true,
   EVAL_KLARO_1: () => klaro.getManager().config.services.every((c) => c.required || !klaro.getManager().consents[c.name]),
   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",
@@ -796,6 +797,7 @@ var AutoConsentCMPBase = class {
       return Promise.resolve(result);
     }
     const snippetSrc = getFunctionBody(snippet);
+    enableLogs && console.log("async eval:", snippetId, snippetSrc);
     return requestEval(snippetSrc).catch((e) => {
       enableLogs && console.error("error evaluating rule", snippetId, e);
       return false;
@@ -1199,7 +1201,7 @@ var Cookiebot = class extends AutoConsentCMPBase {
   constructor() {
     super(...arguments);
     this.name = "Cybotcookiebot";
-    this.prehideSelectors = ["#CybotCookiebotDialog,#dtcookie-container,#cookiebanner,#cb-cookieoverlay"];
+    this.prehideSelectors = ["#CybotCookiebotDialog,#CybotCookiebotDialogBodyUnderlay,#dtcookie-container,#cookiebanner,#cb-cookieoverlay,.modal--cookie-banner,#cookiebanner_outer,#CookieBanner"];
   }
   get hasSelfTest() {
     return true;
@@ -1211,44 +1213,19 @@ var Cookiebot = class extends AutoConsentCMPBase {
     return false;
   }
   async detectCmp() {
-    return elementExists("#CybotCookiebotDialogBodyLevelButtonPreferences");
+    return await this.mainWorldEval("EVAL_COOKIEBOT_1");
   }
   async detectPopup() {
-    return elementExists("#CybotCookiebotDialog,#dtcookie-container,#cookiebanner,#cb-cookiebanner");
+    return await waitFor(() => {
+      return this.mainWorldEval("EVAL_COOKIEBOT_2");
+    }, 10, 500);
   }
   async optOut() {
-    if (click(".cookie-alert-extended-detail-link")) {
-      await waitForElement(".cookie-alert-configuration", 2e3);
-      click(".cookie-alert-configuration-input:checked", true);
-      click(".cookie-alert-extended-button-secondary");
-      return true;
-    }
-    if (elementExists("#dtcookie-container")) {
-      return click(".h-dtcookie-decline");
-    }
-    if (click(".cookiebot__button--settings")) {
-      return true;
-    }
-    if (click("#CybotCookiebotDialogBodyButtonDecline")) {
-      return true;
-    }
-    click(".cookiebanner__link--details");
-    click('.CybotCookiebotDialogBodyLevelButton:checked:enabled,input[id*="CybotCookiebotDialogBodyLevelButton"]:checked:enabled', true);
-    click("#CybotCookiebotDialogBodyButtonDecline");
-    click("input[id^=CybotCookiebotDialogBodyLevelButton]:checked", true);
-    if (elementExists("#CybotCookiebotDialogBodyButtonAcceptSelected")) {
-      click("#CybotCookiebotDialogBodyButtonAcceptSelected");
-    } else {
-      click("#CybotCookiebotDialogBodyLevelButtonAccept,#CybotCookiebotDialogBodyButtonAccept,#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowallSelection", true);
-    }
-    if (await this.mainWorldEval("EVAL_COOKIEBOT_1")) {
-      await this.mainWorldEval("EVAL_COOKIEBOT_2");
-      await wait(500);
-    }
-    if (elementExists("#cb-confirmedSettings")) {
-      await this.mainWorldEval("EVAL_COOKIEBOT_3");
-    }
-    return true;
+    await wait(500);
+    let res = await this.mainWorldEval("EVAL_COOKIEBOT_3");
+    await wait(500);
+    res = res && await this.mainWorldEval("EVAL_COOKIEBOT_4");
+    return res;
   }
   async optIn() {
     if (elementExists("#dtcookie-container")) {
@@ -1260,7 +1237,8 @@ var Cookiebot = class extends AutoConsentCMPBase {
     return true;
   }
   async test() {
-    return this.mainWorldEval("EVAL_COOKIEBOT_4");
+    await wait(500);
+    return await this.mainWorldEval("EVAL_COOKIEBOT_5");
   }
 };
 

package/dist/autoconsent.esm.js

@@ -629,10 +629,11 @@ var snippets = {
   EVAL_CONSENTMANAGER_3: () => __cmp("setConsent", 0),
   EVAL_CONSENTMANAGER_4: () => __cmp("setConsent", 1),
   EVAL_CONSENTMANAGER_5: () => __cmp("consentStatus").userChoiceExists,
-  EVAL_COOKIEBOT_1: () => window.CookieConsent.hasResponse !== true,
-  EVAL_COOKIEBOT_2: () => window.Cookiebot.dialog.submitConsent(),
-  EVAL_COOKIEBOT_3: () => endCookieProcess(),
-  EVAL_COOKIEBOT_4: () => window.CookieConsent.declined === true,
+  EVAL_COOKIEBOT_1: () => !!window.Cookiebot,
+  EVAL_COOKIEBOT_2: () => !window.Cookiebot.hasResponse && window.Cookiebot.dialog?.visible === true,
+  EVAL_COOKIEBOT_3: () => window.Cookiebot.withdraw() || true,
+  EVAL_COOKIEBOT_4: () => window.Cookiebot.hide() || true,
+  EVAL_COOKIEBOT_5: () => window.Cookiebot.declined === true,
   EVAL_KLARO_1: () => klaro.getManager().config.services.every((c) => c.required || !klaro.getManager().consents[c.name]),
   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",
@@ -771,6 +772,7 @@ var AutoConsentCMPBase = class {
       return Promise.resolve(result);
     }
     const snippetSrc = getFunctionBody(snippet);
+    enableLogs && console.log("async eval:", snippetId, snippetSrc);
     return requestEval(snippetSrc).catch((e) => {
       enableLogs && console.error("error evaluating rule", snippetId, e);
       return false;
@@ -1174,7 +1176,7 @@ var Cookiebot = class extends AutoConsentCMPBase {
   constructor() {
     super(...arguments);
     this.name = "Cybotcookiebot";
-    this.prehideSelectors = ["#CybotCookiebotDialog,#dtcookie-container,#cookiebanner,#cb-cookieoverlay"];
+    this.prehideSelectors = ["#CybotCookiebotDialog,#CybotCookiebotDialogBodyUnderlay,#dtcookie-container,#cookiebanner,#cb-cookieoverlay,.modal--cookie-banner,#cookiebanner_outer,#CookieBanner"];
   }
   get hasSelfTest() {
     return true;
@@ -1186,44 +1188,19 @@ var Cookiebot = class extends AutoConsentCMPBase {
     return false;
   }
   async detectCmp() {
-    return elementExists("#CybotCookiebotDialogBodyLevelButtonPreferences");
+    return await this.mainWorldEval("EVAL_COOKIEBOT_1");
   }
   async detectPopup() {
-    return elementExists("#CybotCookiebotDialog,#dtcookie-container,#cookiebanner,#cb-cookiebanner");
+    return await waitFor(() => {
+      return this.mainWorldEval("EVAL_COOKIEBOT_2");
+    }, 10, 500);
   }
   async optOut() {
-    if (click(".cookie-alert-extended-detail-link")) {
-      await waitForElement(".cookie-alert-configuration", 2e3);
-      click(".cookie-alert-configuration-input:checked", true);
-      click(".cookie-alert-extended-button-secondary");
-      return true;
-    }
-    if (elementExists("#dtcookie-container")) {
-      return click(".h-dtcookie-decline");
-    }
-    if (click(".cookiebot__button--settings")) {
-      return true;
-    }
-    if (click("#CybotCookiebotDialogBodyButtonDecline")) {
-      return true;
-    }
-    click(".cookiebanner__link--details");
-    click('.CybotCookiebotDialogBodyLevelButton:checked:enabled,input[id*="CybotCookiebotDialogBodyLevelButton"]:checked:enabled', true);
-    click("#CybotCookiebotDialogBodyButtonDecline");
-    click("input[id^=CybotCookiebotDialogBodyLevelButton]:checked", true);
-    if (elementExists("#CybotCookiebotDialogBodyButtonAcceptSelected")) {
-      click("#CybotCookiebotDialogBodyButtonAcceptSelected");
-    } else {
-      click("#CybotCookiebotDialogBodyLevelButtonAccept,#CybotCookiebotDialogBodyButtonAccept,#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowallSelection", true);
-    }
-    if (await this.mainWorldEval("EVAL_COOKIEBOT_1")) {
-      await this.mainWorldEval("EVAL_COOKIEBOT_2");
-      await wait(500);
-    }
-    if (elementExists("#cb-confirmedSettings")) {
-      await this.mainWorldEval("EVAL_COOKIEBOT_3");
-    }
-    return true;
+    await wait(500);
+    let res = await this.mainWorldEval("EVAL_COOKIEBOT_3");
+    await wait(500);
+    res = res && await this.mainWorldEval("EVAL_COOKIEBOT_4");
+    return res;
   }
   async optIn() {
     if (elementExists("#dtcookie-container")) {
@@ -1235,7 +1212,8 @@ var Cookiebot = class extends AutoConsentCMPBase {
     return true;
   }
   async test() {
-    return this.mainWorldEval("EVAL_COOKIEBOT_4");
+    await wait(500);
+    return await this.mainWorldEval("EVAL_COOKIEBOT_5");
   }
 };