@duckduckgo/autoconsent 6.4.1 → 6.4.3

package/lib/cmps/base.ts

@@ -63,6 +63,7 @@ export default class AutoConsentCMPBase implements AutoCMP {
     }
 
     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;

package/lib/cmps/cookiebot.ts

@@ -1,9 +1,10 @@
-import { click, elementExists, wait, waitForElement } from '../rule-executors';
+import { click, elementExists, wait } from '../rule-executors';
+import { waitFor } from '../utils';
 import AutoConsentCMPBase from './base';
 
 export default class Cookiebot extends AutoConsentCMPBase {
   name = 'Cybotcookiebot';
-  prehideSelectors = ["#CybotCookiebotDialog,#dtcookie-container,#cookiebanner,#cb-cookieoverlay"]
+  prehideSelectors = ["#CybotCookiebotDialog,#CybotCookiebotDialogBodyUnderlay,#dtcookie-container,#cookiebanner,#cb-cookieoverlay,.modal--cookie-banner,#cookiebanner_outer,#CookieBanner"]
 
   get hasSelfTest(): boolean {
     return true;
@@ -18,59 +19,21 @@ export default class Cookiebot extends AutoConsentCMPBase {
   }
 
   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', 2000);
-      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);
-    }
-
-    // some sites have custom submit buttons with no obvious selectors. In this case we just call the submitConsent API.
-    if (await this.mainWorldEval('EVAL_COOKIEBOT_1')) {
-      await this.mainWorldEval('EVAL_COOKIEBOT_2');
-      await wait(500);
-    }
-
-    // site with 3rd confirm settings modal
-    if (elementExists('#cb-confirmedSettings')) {
-      await this.mainWorldEval('EVAL_COOKIEBOT_3');
-    }
-
-    return true;
+    await wait(500);
+    let res = await this.mainWorldEval('EVAL_COOKIEBOT_3'); // withdraw
+    await wait(500); // prevent race conditions
+    res = res && await this.mainWorldEval('EVAL_COOKIEBOT_4'); // hide
+    return res;
   }
 
   async optIn() {
@@ -85,6 +48,7 @@ export default class Cookiebot extends AutoConsentCMPBase {
   }
 
   async test() {
-    return this.mainWorldEval('EVAL_COOKIEBOT_4');
+    await wait(500);
+    return await this.mainWorldEval('EVAL_COOKIEBOT_5');
   }
 }

package/lib/eval-snippets.ts

@@ -9,10 +9,11 @@ export const 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',
@@ -44,6 +45,7 @@ export const snippets = {
   EVAL_COOKIEINFORMATION_0: () => CookieInformation.declineAllCategories() || true,
   EVAL_COOKIEINFORMATION_1: () => CookieInformation.submitAllCategories() || true,
   EVAL_COOKIEINFORMATION_2: () => document.cookie.includes('CookieInformationConsent='),
+  EVAL_COOKIEYES_0: () => document.cookie.includes('advertisement:no'),
   EVAL_DAILYMOTION_0: () => !!document.cookie.match('dm-euconsent-v2'),
   EVAL_DSGVO_0: () => !document.cookie.includes('sp_dsgvo_cookie_settings'),
   EVAL_DUNELM_0: () => document.cookie.includes('cc_functional=0') && document.cookie.includes('cc_targeting=0'),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "6.4.1",
+  "version": "6.4.3",
   "description": "",
   "main": "dist/autoconsent.cjs.js",
   "module": "dist/autoconsent.esm.js",
@@ -11,7 +11,7 @@
     "clean": "rm -r dist",
     "lint": "eslint lib/ playwright/ tests/ rules/autoconsent/*.json",
     "bundle": "./build.sh",
-    "watch": "chokidar \"lib\" \"addon\" \"rules/autoconsent\" -c \"npm run prepublish\"",
+    "watch": "npm run prepublish && chokidar \"lib\" \"addon\" \"rules/autoconsent\" -c \"npm run prepublish\"",
     "create-rule": "node rules/create-rule.mjs",
     "test": "playwright test",
     "test:webkit": "playwright test --project webkit",

package/rules/autoconsent/cookieyes.json

@@ -0,0 +1,32 @@
+{
+    "name": "cookieyes",
+    "prehideSelectors": [".cky-overlay,.cky-consent-container"],
+    "detectCmp": [{ "exists": ".cky-consent-container" }],
+    "detectPopup": [{ "visible": ".cky-consent-container" }],
+    "optIn": [
+      { "waitForThenClick": ".cky-consent-container [data-cky-tag=accept-button]" }
+    ],
+    "optOut": [
+      {
+        "if": { "exists": ".cky-consent-container [data-cky-tag=reject-button]" },
+        "then": [
+          { "waitForThenClick": ".cky-consent-container [data-cky-tag=reject-button]" }
+        ],
+        "else": [
+          {
+            "if": { "exists": ".cky-consent-container [data-cky-tag=settings-button]" },
+            "then": [
+              { "click": ".cky-consent-container [data-cky-tag=settings-button]" },
+              { "waitFor": ".cky-modal-open input[type=checkbox]" },
+              { "click": ".cky-modal-open input[type=checkbox]:checked", "all": true, "optional": true },
+              { "waitForThenClick": ".cky-modal [data-cky-tag=detail-save-button]" }
+            ],
+            "else": [
+              { "hide": [".cky-consent-container,.cky-overlay"] }
+            ]
+          }
+        ]
+      }
+    ],
+    "test": [{ "eval": "EVAL_COOKIEYES_0" }]
+  }

package/rules/autoconsent/yahoo.json

@@ -0,0 +1,15 @@
+{
+    "name": "Yahoo",
+    "runContext": {
+        "urlPattern": "^https://consent\\.yahoo\\.com/v2/"
+    },
+    "prehideSelectors": ["#reject-all"],
+    "detectCmp": [{ "exists": "#consent-page" }],
+    "detectPopup": [{ "visible": "#consent-page" }],
+    "optIn": [
+        { "waitForThenClick": "#consent-page button[value=agree]" }
+    ],
+    "optOut": [
+        { "waitForThenClick": "#consent-page button[value=reject]" }
+    ]
+}

package/rules/rules.json

@@ -1496,6 +1496,74 @@
         }
       ]
     },
+    {
+      "name": "cookieyes",
+      "prehideSelectors": [
+        ".cky-overlay,.cky-consent-container"
+      ],
+      "detectCmp": [
+        {
+          "exists": ".cky-consent-container"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": ".cky-consent-container"
+        }
+      ],
+      "optIn": [
+        {
+          "waitForThenClick": ".cky-consent-container [data-cky-tag=accept-button]"
+        }
+      ],
+      "optOut": [
+        {
+          "if": {
+            "exists": ".cky-consent-container [data-cky-tag=reject-button]"
+          },
+          "then": [
+            {
+              "waitForThenClick": ".cky-consent-container [data-cky-tag=reject-button]"
+            }
+          ],
+          "else": [
+            {
+              "if": {
+                "exists": ".cky-consent-container [data-cky-tag=settings-button]"
+              },
+              "then": [
+                {
+                  "click": ".cky-consent-container [data-cky-tag=settings-button]"
+                },
+                {
+                  "waitFor": ".cky-modal-open input[type=checkbox]"
+                },
+                {
+                  "click": ".cky-modal-open input[type=checkbox]:checked",
+                  "all": true,
+                  "optional": true
+                },
+                {
+                  "waitForThenClick": ".cky-modal [data-cky-tag=detail-save-button]"
+                }
+              ],
+              "else": [
+                {
+                  "hide": [
+                    ".cky-consent-container,.cky-overlay"
+                  ]
+                }
+              ]
+            }
+          ]
+        }
+      ],
+      "test": [
+        {
+          "eval": "EVAL_COOKIEYES_0"
+        }
+      ]
+    },
     {
       "name": "corona-in-zahlen.de",
       "prehideSelectors": [
@@ -5193,6 +5261,35 @@
         }
       ]
     },
+    {
+      "name": "Yahoo",
+      "runContext": {
+        "urlPattern": "^https://consent\\.yahoo\\.com/v2/"
+      },
+      "prehideSelectors": [
+        "#reject-all"
+      ],
+      "detectCmp": [
+        {
+          "exists": "#consent-page"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": "#consent-page"
+        }
+      ],
+      "optIn": [
+        {
+          "waitForThenClick": "#consent-page button[value=agree]"
+        }
+      ],
+      "optOut": [
+        {
+          "waitForThenClick": "#consent-page button[value=reject]"
+        }
+      ]
+    },
     {
       "name": "youporn.com",
       "cosmetic": true,

package/tests/cookiebot.spec.ts

@@ -10,3 +10,14 @@ generateCMPTests('Cybotcookiebot', [
 ], {
   skipRegions: ['US']
 });
+
+generateCMPTests('Cybotcookiebot', [
+  "https://dl.acm.org/",
+  "https://www.ifm.org/",
+  "https://www.thule.com/",
+  "https://www.dezeen.com/",
+  "https://www.l3harris.com/",
+  "https://www.gog.com/"
+], {
+});
+

package/tests/cookieyes.spec.ts

@@ -0,0 +1,10 @@
+import generateCMPTests from "../playwright/runner";
+
+generateCMPTests('cookieyes', [
+  'https://www.cookieyes.com/',
+  'https://www.primefaces.org/',
+  'https://www.undip.ac.id/',
+  'https://ttinteractive.com/',
+  'https://www.chronofhorse.com/',
+  'https://nl.flaminfitness.com/products/30l-tactical-backpack'
+]);

package/tests/yahoo.spec.ts

@@ -0,0 +1,7 @@
+import generateCMPTests from "../playwright/runner";
+
+generateCMPTests('Yahoo', [
+  'https://www.yahoo.com/'
+], {
+  skipRegions: ['US']
+});