@duckduckgo/autoconsent 6.2.0 → 6.4.0

package/lib/cmps/onetrust.ts

@@ -1,4 +1,4 @@
-import { click, elementExists, elementVisible, wait, waitForElement } from "../rule-executors";
+import { click, elementExists, elementVisible, wait, waitForElement, waitForVisible } from "../rule-executors";
 import { RunContext } from "../rules";
 import { waitFor } from "../utils";
 import AutoConsentCMPBase from "./base";
@@ -32,6 +32,10 @@ export default class Onetrust extends AutoConsentCMPBase {
   }
 
   async optOut() {
+    if (elementVisible("#onetrust-reject-all-handler,.js-reject-cookies", 'any')) { // 'reject all' shortcut
+      return click("#onetrust-reject-all-handler,.js-reject-cookies");
+    }
+
     if (elementExists("#onetrust-pc-btn-handler")) { // "show purposes" button inside a popup
       click("#onetrust-pc-btn-handler");
     } else { // otherwise look for a generic "show settings" button
@@ -39,19 +43,15 @@ export default class Onetrust extends AutoConsentCMPBase {
     }
 
     await waitForElement('#onetrust-consent-sdk', 2000);
-    await wait(1000);
+    await wait(1000); // ideally we want to wait for popup visivility, but it's tricky on e.g. stackoverflow.com
     click("#onetrust-consent-sdk input.category-switch-handler:checked,.js-editor-toggle-state:checked", true); // optional step
 
-    await wait(1000);
+    await wait(1000); // ideally we want to wait for popup visivility, but it's tricky on e.g. stackoverflow.com
     await waitForElement(".save-preference-btn-handler,.js-consent-save", 2000);
     click(".save-preference-btn-handler,.js-consent-save");
 
     // popup doesn't disappear immediately
-    await waitFor(
-      () => elementVisible("#onetrust-banner-sdk", 'none'),
-      10,
-      500
-    );
+    await waitForVisible("#onetrust-banner-sdk", 5000, 'none');
     return true;
   }
 
@@ -60,6 +60,10 @@ export default class Onetrust extends AutoConsentCMPBase {
   }
 
   async test() {
-    return await this.mainWorldEval('EVAL_ONETRUST_1');
+    return await waitFor(
+      () => this.mainWorldEval('EVAL_ONETRUST_1'),
+      10,
+      500
+    )
   }
 }

package/lib/eval-snippets.ts

@@ -26,6 +26,7 @@ export const snippets = {
   EVAL_BORLABS_0: () => !JSON.parse(decodeURIComponent(document.cookie.split(';').find(c => c.indexOf('borlabs-cookie') !== -1).split('=', 2)[1])).consents.statistics,
   EVAL_BUNDESREGIERUNG_DE_0: () => document.cookie.match('cookie-allow-tracking=0'),
   EVAL_CANVA_0: () => !document.cookie.includes('gtm_fpc_engagement_event'),
+  EVAL_CC_BANNER2_0: () => !!document.cookie.match(/sncc=[^;]+D%3Dtrue/),
   EVAL_CLICKIO_0: () => document.cookie.includes('__lxG__consent__v2_daisybit='),
   EVAL_CLINCH_0: () => document.cookie.includes('ctc_rejected=1'),
   EVAL_COINBASE_0: () => JSON.parse(decodeURIComponent(document.cookie.match(/cm_(eu|default)_preferences=([0-9a-zA-Z\\{\\}\\[\\]%:]*);?/)[2])).consent.length <= 1,
@@ -70,6 +71,7 @@ export const snippets = {
   EVAL_SIRDATA_0: () => document.cookie.includes('euconsent-v2'),
   EVAL_SNIGEL_0: () => !!document.cookie.match('snconsent'),
   EVAL_STEAMPOWERED_0: () => JSON.parse(decodeURIComponent(document.cookie.split(';').find(s => s.trim().startsWith('cookieSettings')).split('=')[1])).preference_state === 2,
+  EVAL_TAKEALOT_0: () => document.body.classList.remove('freeze') || (document.body.style = '') || true,
   EVAL_TARTEAUCITRON_0: () => tarteaucitron.userInterface.respondAll(false) || true,
   EVAL_TARTEAUCITRON_1: () => tarteaucitron.userInterface.respondAll(true) || true,
   EVAL_TARTEAUCITRON_2: () => document.cookie.match(/tarteaucitron=[^;]*/)[0].includes('false'),

package/lib/web.ts

@@ -158,7 +158,11 @@ export default class AutoConsent {
       }
       return false;
     }
+
     this.updateState({ lifecycle: 'openPopupDetected' });
+    if (this.config.enablePrehide && !this.state.prehideOn) { // prehide might have timeouted by this time, apply it again
+      this.prehideElements();
+    }
 
     if (foundPopups.length > 1) {
       const errorDetails = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "6.2.0",
+  "version": "6.4.0",
   "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\" -c \"./build.sh\"",
+    "watch": "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",
@@ -33,7 +33,7 @@
     "@playwright/test": "^1.17.1",
     "@puppeteer/replay": "^2.11.0",
     "@types/chai": "^4.3.1",
-    "@types/chrome": "^0.0.245",
+    "@types/chrome": "^0.0.251",
     "@types/mocha": "^10.0.1",
     "@typescript-eslint/eslint-plugin": "^5.42.1",
     "@typescript-eslint/parser": "^5.42.1",

package/rules/autoconsent/cc-banner-springer.json

@@ -0,0 +1,26 @@
+{
+    "name": "cc-banner-springer",
+    "prehideSelectors": [".cc-banner[data-cc-banner]"],
+    "detectCmp": [{ "exists": ".cc-banner[data-cc-banner]" }],
+    "detectPopup": [{ "visible": ".cc-banner[data-cc-banner]" }],
+    "optIn": [
+      { "waitForThenClick": ".cc-banner[data-cc-banner] button[data-cc-action=accept]" }
+    ],
+    "optOut": [
+      {
+        "if": { "exists": ".cc-banner[data-cc-banner] button[data-cc-action=reject]" },
+        "then": [{ "click": ".cc-banner[data-cc-banner] button[data-cc-action=reject]" }],
+        "else": [
+          { "waitForThenClick": ".cc-banner[data-cc-banner] button[data-cc-action=preferences]" },
+          { "waitFor": ".cc-preferences[data-cc-preferences]" },
+          { "click": ".cc-preferences[data-cc-preferences] input[type=radio][data-cc-action=toggle-category][value=off]", "all": true },
+          {
+            "if": { "exists": ".cc-preferences[data-cc-preferences] button[data-cc-action=reject]" },
+            "then": [{ "click": ".cc-preferences[data-cc-preferences] button[data-cc-action=reject]" }],
+            "else": [{ "click": ".cc-preferences[data-cc-preferences] button[data-cc-action=save]" }]
+          }
+        ]
+      }
+    ],
+    "test": [{ "eval": "EVAL_CC_BANNER2_0"}]
+  }

package/rules/autoconsent/takealot-com.json

@@ -1,13 +1,18 @@
 {
   "name": "takealot.com",
   "cosmetic": true,
-  "prehideSelectors": ["div[class^=\"cookies-banner-module_cookie-banner_\"]"],
+  "prehideSelectors": ["div[class^=\"cookies-banner-module_\"]"],
   "detectCmp": [{ "exists": "div[class^=\"cookies-banner-module_cookie-banner_\"]" }],
   "detectPopup": [{ "exists": "div[class^=\"cookies-banner-module_cookie-banner_\"]" }],
   "optIn": [
     { "click": "button[class*=\"cookies-banner-module_dismiss-button_\"]" }
    ],
   "optOut": [
-    { "hide": ["div[class^=\"cookies-banner-module_cookie-banner_\"]"] }
+    { "hide": ["div[class^=\"cookies-banner-module_\"]"] },
+    {
+      "if": { "exists": "div[class^=\"cookies-banner-module_small-cookie-banner_\"]" },
+      "then": [{ "eval": "EVAL_TAKEALOT_0"}],
+      "else": []
+    }
    ]
   }

package/rules/autoconsent/zdf.json

@@ -0,0 +1,9 @@
+{
+  "name": "zdf",
+  "prehideSelectors": ["#zdf-cmp-banner-sdk"],
+  "detectCmp": [{ "exists": "#zdf-cmp-banner-sdk" }],
+  "detectPopup": [{ "visible": "#zdf-cmp-main.zdf-cmp-show" }],
+  "optIn": [ { "waitForThenClick": "#zdf-cmp-main #zdf-cmp-accept-btn" } ],
+  "optOut": [ { "waitForThenClick": "#zdf-cmp-main #zdf-cmp-deny-btn" } ],
+  "test": []
+}

package/rules/rules.json

@@ -777,6 +777,71 @@
         }
       ]
     },
+    {
+      "name": "cc-banner-springer",
+      "prehideSelectors": [
+        ".cc-banner[data-cc-banner]"
+      ],
+      "detectCmp": [
+        {
+          "exists": ".cc-banner[data-cc-banner]"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": ".cc-banner[data-cc-banner]"
+        }
+      ],
+      "optIn": [
+        {
+          "waitForThenClick": ".cc-banner[data-cc-banner] button[data-cc-action=accept]"
+        }
+      ],
+      "optOut": [
+        {
+          "if": {
+            "exists": ".cc-banner[data-cc-banner] button[data-cc-action=reject]"
+          },
+          "then": [
+            {
+              "click": ".cc-banner[data-cc-banner] button[data-cc-action=reject]"
+            }
+          ],
+          "else": [
+            {
+              "waitForThenClick": ".cc-banner[data-cc-banner] button[data-cc-action=preferences]"
+            },
+            {
+              "waitFor": ".cc-preferences[data-cc-preferences]"
+            },
+            {
+              "click": ".cc-preferences[data-cc-preferences] input[type=radio][data-cc-action=toggle-category][value=off]",
+              "all": true
+            },
+            {
+              "if": {
+                "exists": ".cc-preferences[data-cc-preferences] button[data-cc-action=reject]"
+              },
+              "then": [
+                {
+                  "click": ".cc-preferences[data-cc-preferences] button[data-cc-action=reject]"
+                }
+              ],
+              "else": [
+                {
+                  "click": ".cc-preferences[data-cc-preferences] button[data-cc-action=save]"
+                }
+              ]
+            }
+          ]
+        }
+      ],
+      "test": [
+        {
+          "eval": "EVAL_CC_BANNER2_0"
+        }
+      ]
+    },
     {
       "name": "cc_banner",
       "cosmetic": true,
@@ -3917,7 +3982,7 @@
       "name": "takealot.com",
       "cosmetic": true,
       "prehideSelectors": [
-        "div[class^=\"cookies-banner-module_cookie-banner_\"]"
+        "div[class^=\"cookies-banner-module_\"]"
       ],
       "detectCmp": [
         {
@@ -3937,8 +4002,19 @@
       "optOut": [
         {
           "hide": [
-            "div[class^=\"cookies-banner-module_cookie-banner_\"]"
+            "div[class^=\"cookies-banner-module_\"]"
           ]
+        },
+        {
+          "if": {
+            "exists": "div[class^=\"cookies-banner-module_small-cookie-banner_\"]"
+          },
+          "then": [
+            {
+              "eval": "EVAL_TAKEALOT_0"
+            }
+          ],
+          "else": []
         }
       ]
     },
@@ -5229,6 +5305,33 @@
           "eval": "EVAL_YOUTUBE_MOBILE_0"
         }
       ]
+    },
+    {
+      "name": "zdf",
+      "prehideSelectors": [
+        "#zdf-cmp-banner-sdk"
+      ],
+      "detectCmp": [
+        {
+          "exists": "#zdf-cmp-banner-sdk"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": "#zdf-cmp-main.zdf-cmp-show"
+        }
+      ],
+      "optIn": [
+        {
+          "waitForThenClick": "#zdf-cmp-main #zdf-cmp-accept-btn"
+        }
+      ],
+      "optOut": [
+        {
+          "waitForThenClick": "#zdf-cmp-main #zdf-cmp-deny-btn"
+        }
+      ],
+      "test": []
     }
   ],
   "consentomatic": {

package/tests/cc-banner-springer.spec.ts

@@ -0,0 +1,6 @@
+import generateCMPTests from "../playwright/runner";
+
+generateCMPTests('cc-banner-springer', [
+  'https://www.nature.com/',
+  'https://www.springernature.com/gp'
+]);

package/tests/onetrust.spec.ts

@@ -2,7 +2,6 @@ import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('Onetrust', [
   'https://stackoverflow.com/',
-  'https://www.zdf.de/',
   "https://www.lovescout24.de/",
   "https://www.okcupid.com/",
   "https://doodle.com/",

package/tests/takealot-com.spec.ts

@@ -2,4 +2,12 @@ import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('takealot.com', [
   'https://www.takealot.com/',
-], {});
+], {
+  mobile: false,
+});
+
+generateCMPTests('takealot.com', [
+  'https://www.takealot.com/',
+], {
+  mobile: true,
+});

package/tests/zdf.spec.ts

@@ -0,0 +1,5 @@
+import generateCMPTests from "../playwright/runner";
+
+generateCMPTests('zdf', [
+  'https://www.zdf.de/',
+]);