@duckduckgo/autoconsent 10.1.0 → 10.3.0

package/dist/autoconsent.unit.js

@@ -1441,14 +1441,14 @@
       return false;
     }
     async detectCmp() {
-      return this.elementExists("#onetrust-banner-sdk");
+      return this.elementExists("#onetrust-banner-sdk,#onetrust-pc-sdk");
     }
     async detectPopup() {
-      return this.elementVisible("#onetrust-banner-sdk", "all");
+      return this.elementVisible("#onetrust-banner-sdk,#onetrust-pc-sdk", "any");
     }
     async optOut() {
-      if (this.elementVisible("#onetrust-reject-all-handler,.js-reject-cookies", "any")) {
-        return this.click("#onetrust-reject-all-handler,.js-reject-cookies");
+      if (this.elementVisible("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies", "any")) {
+        return this.click("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies");
       }
       if (this.elementExists("#onetrust-pc-btn-handler")) {
         this.click("#onetrust-pc-btn-handler");
@@ -1465,7 +1465,7 @@
       return true;
     }
     async optIn() {
-      return this.click("#onetrust-accept-btn-handler,.js-accept-cookies");
+      return this.click("#onetrust-accept-btn-handler,#accept-recommended-btn-handler,.js-accept-cookies");
     }
     async test() {
       return await waitFor(
@@ -7508,7 +7508,7 @@
     },
     {
       name: "Sirdata",
-      cosmetic: true,
+      cosmetic: false,
       prehideSelectors: [
         "#sd-cmp"
       ],
@@ -7529,10 +7529,10 @@
       ],
       optOut: [
         {
-          hide: "#sd-cmp"
-        },
-        {
-          eval: "EVAL_SIRDATA_UNBLOCK_SCROLL"
+          waitForThenClick: [
+            "#sd-cmp",
+            "xpath///span[contains(., 'Do not accept') or contains(., 'Acceptera inte') or contains(., 'No aceptar') or contains(., 'Ikke acceptere') or contains(., 'Nicht akzeptieren') or contains(., '\u041D\u0435 \u043F\u0440\u0438\u0435\u043C\u0430\u043C') or contains(., '\u039D\u03B1 \u03BC\u03B7\u03BD \u03B3\u03AF\u03BD\u03B5\u03B9 \u03B1\u03C0\u03BF\u03B4\u03BF\u03C7\u03AE') or contains(., 'Niet accepteren') or contains(., 'Nep\u0159ij\xEDmat') or contains(., 'Nie akceptuj') or contains(., 'Nu accepta\u021Bi') or contains(., 'N\xE3o aceitar') or contains(., 'Continuer sans accepter') or contains(., 'Non accettare') or contains(., 'Nem fogad el')]"
+          ]
         }
       ]
     },

package/lib/cmps/onetrust.ts

@@ -23,16 +23,16 @@ export default class Onetrust extends AutoConsentCMPBase {
   }
 
   async detectCmp() {
-    return this.elementExists("#onetrust-banner-sdk");
+    return this.elementExists("#onetrust-banner-sdk,#onetrust-pc-sdk");
   }
 
   async detectPopup() {
-    return this.elementVisible("#onetrust-banner-sdk", 'all');
+    return this.elementVisible("#onetrust-banner-sdk,#onetrust-pc-sdk", "any");
   }
 
   async optOut() {
-    if (this.elementVisible("#onetrust-reject-all-handler,.js-reject-cookies", 'any')) { // 'reject all' shortcut
-      return this.click("#onetrust-reject-all-handler,.js-reject-cookies");
+    if (this.elementVisible("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies", 'any')) { // 'reject all' shortcut
+      return this.click("#onetrust-reject-all-handler,.ot-pc-refuse-all-handler,.js-reject-cookies");
     }
 
     if (this.elementExists("#onetrust-pc-btn-handler")) { // "show purposes" button inside a popup
@@ -55,7 +55,7 @@ export default class Onetrust extends AutoConsentCMPBase {
   }
 
   async optIn() {
-    return this.click("#onetrust-accept-btn-handler,.js-accept-cookies");
+    return this.click("#onetrust-accept-btn-handler,#accept-recommended-btn-handler,.js-accept-cookies");
   }
 
   async test() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "10.1.0",
+  "version": "10.3.0",
   "description": "",
   "main": "dist/autoconsent.cjs.js",
   "module": "dist/autoconsent.esm.js",
@@ -26,7 +26,8 @@
     "vendor-copy": "mkdir -p addon/vendor && cp node_modules/mocha/mocha.* addon/vendor/ && cp node_modules/chai/chai.js addon/vendor/",
     "prepublish": "npm run build-rules && npm run bundle",
     "launch:firefox": "web-ext run -s dist/addon-firefox",
-    "release": "auto shipit"
+    "release": "auto shipit",
+    "get-text-for-xpath": "ts-node scripts/get-text-for-xpath.ts"
   },
   "author": "Sam Macbeth",
   "license": "MPL-2.0",
@@ -34,10 +35,11 @@
     "@playwright/test": "^1.17.1",
     "@puppeteer/replay": "^3.0.0",
     "@types/chai": "^4.3.1",
-    "@types/chrome": "^0.0.261",
+    "@types/chrome": "^0.0.263",
     "@types/mocha": "^10.0.1",
     "@typescript-eslint/eslint-plugin": "^7.0.1",
     "@typescript-eslint/parser": "^7.0.1",
+    "asana": "^1.0.2",
     "auto": "^11.0.1",
     "bulma": "^0.9.4",
     "chai": "^5.0.0",
@@ -45,7 +47,9 @@
     "esbuild": "^0.20.0",
     "eslint": "^8.27.0",
     "eslint-plugin-json": "^3.1.0",
+    "markdown-it": "^14.0.0",
     "mocha": "^10.0.0",
+    "ts-node": "^10.9.2",
     "tslib": "^2.4.0",
     "typescript": "^5.1.6",
     "web-ext": "^7.3.0"

package/rules/autoconsent/sirdata.json

@@ -1,12 +1,30 @@
 {
   "name": "Sirdata",
-  "cosmetic": true,
-  "prehideSelectors": ["#sd-cmp"],
-  "detectCmp": [{ "exists": "#sd-cmp" }],
-  "detectPopup": [{ "visible": "#sd-cmp" }],
-  "optIn": [ { "waitForThenClick": "#sd-cmp .sd-cmp-3cRQ2" } ],
+  "cosmetic": false,
+  "prehideSelectors": [
+    "#sd-cmp"
+  ],
+  "detectCmp": [
+    {
+      "exists": "#sd-cmp"
+    }
+  ],
+  "detectPopup": [
+    {
+      "visible": "#sd-cmp"
+    }
+  ],
+  "optIn": [
+    {
+      "waitForThenClick": "#sd-cmp .sd-cmp-3cRQ2"
+    }
+  ],
   "optOut": [
-    { "hide": "#sd-cmp" },
-    { "eval": "EVAL_SIRDATA_UNBLOCK_SCROLL" }
+    {
+      "waitForThenClick": [
+        "#sd-cmp",
+        "xpath///span[contains(., 'Do not accept') or contains(., 'Acceptera inte') or contains(., 'No aceptar') or contains(., 'Ikke acceptere') or contains(., 'Nicht akzeptieren') or contains(., 'Не приемам') or contains(., 'Να μην γίνει αποδοχή') or contains(., 'Niet accepteren') or contains(., 'Nepřijímat') or contains(., 'Nie akceptuj') or contains(., 'Nu acceptați') or contains(., 'Não aceitar') or contains(., 'Continuer sans accepter') or contains(., 'Non accettare') or contains(., 'Nem fogad el')]"
+      ]
+    }
   ]
 }

package/rules/rules.json

@@ -5201,7 +5201,7 @@
     },
     {
       "name": "Sirdata",
-      "cosmetic": true,
+      "cosmetic": false,
       "prehideSelectors": [
         "#sd-cmp"
       ],
@@ -5222,10 +5222,10 @@
       ],
       "optOut": [
         {
-          "hide": "#sd-cmp"
-        },
-        {
-          "eval": "EVAL_SIRDATA_UNBLOCK_SCROLL"
+          "waitForThenClick": [
+            "#sd-cmp",
+            "xpath///span[contains(., 'Do not accept') or contains(., 'Acceptera inte') or contains(., 'No aceptar') or contains(., 'Ikke acceptere') or contains(., 'Nicht akzeptieren') or contains(., 'Не приемам') or contains(., 'Να μην γίνει αποδοχή') or contains(., 'Niet accepteren') or contains(., 'Nepřijímat') or contains(., 'Nie akceptuj') or contains(., 'Nu acceptați') or contains(., 'Não aceitar') or contains(., 'Continuer sans accepter') or contains(., 'Non accettare') or contains(., 'Nem fogad el')]"
+          ]
         }
       ]
     },

package/scripts/get-text-for-xpath.ts

@@ -0,0 +1,78 @@
+/**
+ * Utility script to get the contents of a specific element for multiple locales
+ */
+import { chromium } from "@playwright/test";
+
+// list of locales supported by DDG apps and extensions
+const locales = [
+  "bg",
+  "cs",
+  "da",
+  "de", 
+  "el",
+  "en", 
+  "en", 
+  "es",
+  "et",
+  "fi",
+  "fr",
+  "hr",
+  "hu",
+  "it",
+  "lt",
+  "lv",
+  "nb",
+  "nl",
+  "pl",
+  "pt",
+  "ro",
+  "ru",
+  "sk",
+  "sl",
+  "sv",
+  "tr"
+];
+if (process.argv.length < 4) {
+  console.log('Usage: npm run get-text-for-xpath -- <URL> <XPATH>')
+  process.exit(0)
+}
+const url = process.argv[2];
+const xpath = process.argv[3];
+const values = new Set()
+console.log(`Checking contents of ${xpath} on ${url}`);
+
+
+(async () => {
+  const browser = await chromium.launch();
+
+  async function checkLocale(locale: string) {
+    const context = await browser.newContext({ locale });
+    const page = await context.newPage();
+    await page.goto(url, {
+      waitUntil: "networkidle",
+      timeout: 30000
+    });
+    const locator = page.locator(`xpath=${xpath}`);
+    const content = await locator.textContent()
+    console.log(locale, content);
+    values.add(content)
+    await page.close();
+    await context.close();
+  }
+
+  const crawls = locales.map(async (locale) => {
+    try {
+      await checkLocale(locale)
+    } catch (e) {
+      console.warn(`Failed on locale ${locale}, retrying...`, e)
+      await checkLocale(locale)
+    }
+  })
+  await Promise.all(crawls)
+  await browser.close();
+  console.log('Final set of strings:')
+  console.log([...values])
+  console.log('Example xpath rule:')
+  const containsClause = [...values].map(v => `contains(., '${v}')`).join(' or ')
+  console.log(`xpath///span[${containsClause}]`)
+})();

package/tests/onetrust.spec.ts

@@ -5,6 +5,7 @@ generateCMPTests('Onetrust', [
   "https://www.lovescout24.de/",
   "https://www.okcupid.com/",
   "https://doodle.com/",
+  "https://www.coca-cola.com/us/en",
 ]);
 
 generateCMPTests('Onetrust', [