@duckduckgo/autoconsent 3.0.4 → 4.0.0

package/lib/cmps/sourcepoint-frame.ts

@@ -5,9 +5,10 @@ import { waitFor } from "../utils";
 import AutoConsentCMPBase from "./base";
 
 export default class SourcePoint extends AutoConsentCMPBase {
-  prehideSelectors = ["div[id^='sp_message_container_'],.message-overlay"]
+  prehideSelectors = ["div[id^='sp_message_container_'],.message-overlay",'#sp_privacy_manager_container']
 
-  ccpaMode = false;
+  ccpaNotice = false;
+  ccpaPopup = false;
 
   runContext: RunContext = {
     main: false,
@@ -29,7 +30,11 @@ export default class SourcePoint extends AutoConsentCMPBase {
   async detectCmp() {
     const url = new URL(location.href);
     if (url.searchParams.has('message_id') && url.hostname === 'ccpa-notice.sp-prod.net') {
-      this.ccpaMode = true;
+      this.ccpaNotice = true;
+      return true;
+    }
+    if (url.hostname === 'ccpa-pm.sp-prod.net') {
+      this.ccpaPopup = true;
       return true;
     }
     return (url.pathname === '/index.html' || url.pathname === '/privacy-manager/index.html')
@@ -37,6 +42,12 @@ export default class SourcePoint extends AutoConsentCMPBase {
   }
 
   async detectPopup() {
+    if (this.ccpaNotice) {
+      return true;
+    }
+    if (this.ccpaPopup) {
+      return await waitForElement('.priv-save-btn', 2000);
+    }
     // check for the paywall button, and bail if it exists to prevent broken opt out
     await waitForElement(".sp_choice_type_11,.sp_choice_type_12,.sp_choice_type_13,.sp_choice_type_ACCEPT_ALL", 2000);
     return !elementExists('.sp_choice_type_9');
@@ -55,10 +66,23 @@ export default class SourcePoint extends AutoConsentCMPBase {
   }
 
   isManagerOpen() {
-    return (new URL(location.href)).pathname === "/privacy-manager/index.html";
+    return location.pathname === "/privacy-manager/index.html";
   }
 
   async optOut() {
+    if (this.ccpaPopup) {
+      // toggles with 2 buttons
+      const toggles = document.querySelectorAll('.priv-purpose-container .sp-switch-arrow-block a.neutral.on .right') as NodeListOf<HTMLElement>;
+      for (const t of toggles) {
+        click([t]);
+      }
+      // switch toggles
+      const switches = document.querySelectorAll('.priv-purpose-container .sp-switch-arrow-block a.switch-bg.on') as NodeListOf<HTMLElement>;
+      for (const t of switches) {
+        click([t]);
+      }
+      return click('.priv-save-btn');
+    }
     if (!this.isManagerOpen()) {
       const actionable = await waitForElement('.sp_choice_type_12,.sp_choice_type_13');
       if (!actionable) {
@@ -72,7 +96,7 @@ export default class SourcePoint extends AutoConsentCMPBase {
       click(".sp_choice_type_12");
       // the page may navigate at this point but that's okay
       await waitFor(
-        () => location.pathname === "/privacy-manager/index.html",
+        () => this.isManagerOpen(),
         200,
         100
       );
@@ -102,7 +126,7 @@ export default class SourcePoint extends AutoConsentCMPBase {
     } catch (e) {
       enableLogs && console.warn(e);
     }
-    click('.sp_choice_type_SAVE_AND_EXIT');
-    return true;
+    // TODO: race condition: the popup disappears very quickly, so the background script may not receive a success report.
+    return click('.sp_choice_type_SAVE_AND_EXIT');
   }
 }

package/lib/consentomatic/index.ts

@@ -28,7 +28,7 @@ export async function executeAction(config: any, param?: any): Promise<boolean |
     case "slide":
       return slideAction(config);
     case "close":
-      return closeAction(config);
+      return closeAction();
     case "wait":
       return waitAction(config);
     case "eval":
@@ -57,7 +57,7 @@ async function clickAction(config: any) {
 }
 
 async function listAction(config: any, param: any) {
-  for (let action of config.actions) {
+  for (const action of config.actions) {
     await executeAction(action, param);
   }
 }
@@ -141,8 +141,8 @@ async function slideAction(config: any) {
   const result = Tools.find(config);
   const dragResult = Tools.find(config.dragTarget);
   if (result.target) {
-    let targetBounds = result.target.getBoundingClientRect();
-    let dragTargetBounds = dragResult.target.getBoundingClientRect();
+    const targetBounds = result.target.getBoundingClientRect();
+    const dragTargetBounds = dragResult.target.getBoundingClientRect();
 
     let yDiff = dragTargetBounds.top - targetBounds.top;
     let xDiff = dragTargetBounds.left - targetBounds.left;
@@ -154,12 +154,12 @@ async function slideAction(config: any) {
       yDiff = 0;
     }
 
-    let screenX = window.screenX + targetBounds.left + targetBounds.width / 2.0;
-    let screenY = window.screenY + targetBounds.top + targetBounds.height / 2.0;
-    let clientX = targetBounds.left + targetBounds.width / 2.0;
-    let clientY = targetBounds.top + targetBounds.height / 2.0;
+    const screenX = window.screenX + targetBounds.left + targetBounds.width / 2.0;
+    const screenY = window.screenY + targetBounds.top + targetBounds.height / 2.0;
+    const clientX = targetBounds.left + targetBounds.width / 2.0;
+    const clientY = targetBounds.top + targetBounds.height / 2.0;
 
-    let mouseDown = document.createEvent("MouseEvents");
+    const mouseDown = document.createEvent("MouseEvents");
     mouseDown.initMouseEvent(
       "mousedown",
       true,
@@ -177,7 +177,7 @@ async function slideAction(config: any) {
       0,
       result.target
     );
-    let mouseMove = document.createEvent("MouseEvents");
+    const mouseMove = document.createEvent("MouseEvents");
     mouseMove.initMouseEvent(
       "mousemove",
       true,
@@ -195,7 +195,7 @@ async function slideAction(config: any) {
       0,
       result.target
     );
-    let mouseUp = document.createEvent("MouseEvents");
+    const mouseUp = document.createEvent("MouseEvents");
     mouseUp.initMouseEvent(
       "mouseup",
       true,
@@ -225,7 +225,7 @@ async function waitAction(config: any) {
   await waitTimeout(config.waitTime);
 }
 
-async function closeAction(config: any) {
+async function closeAction() {
   window.close();
 }
 

package/lib/consentomatic/tools.ts

@@ -28,12 +28,12 @@ export default class Tools {
 
     if (options.textFilter != null) {
       possibleTargets = possibleTargets.filter(possibleTarget => {
-        let textContent = possibleTarget.textContent.toLowerCase();
+        const textContent = possibleTarget.textContent.toLowerCase();
 
         if (Array.isArray(options.textFilter)) {
           let foundText = false;
 
-          for (let text of options.textFilter) {
+          for (const text of options.textFilter) {
             if (textContent.indexOf(text.toLowerCase()) !== -1) {
               foundText = true;
               break;
@@ -49,12 +49,12 @@ export default class Tools {
 
     if (options.styleFilters != null) {
       possibleTargets = possibleTargets.filter(possibleTarget => {
-        let styles = window.getComputedStyle(possibleTarget);
+        const styles = window.getComputedStyle(possibleTarget);
 
         let keep = true;
 
-        for (let styleFilter of options.styleFilters) {
-          let option = styles[styleFilter.option];
+        for (const styleFilter of options.styleFilters) {
+          const option = styles[styleFilter.option];
 
           if (styleFilter.negated) {
             keep = keep && option !== styleFilter.value;
@@ -80,7 +80,7 @@ export default class Tools {
     }
 
     if (options.iframeFilter != null) {
-      possibleTargets = possibleTargets.filter(possibleTarget => {
+      possibleTargets = possibleTargets.filter((/* possibleTarget */) => {
         if (options.iframeFilter) {
           //We should be inside an iframe
           return window.location !== window.parent.location;
@@ -93,9 +93,9 @@ export default class Tools {
 
     if (options.childFilter != null) {
       possibleTargets = possibleTargets.filter(possibleTarget => {
-        let oldBase = Tools.base;
+        const oldBase = Tools.base;
         Tools.setBase(possibleTarget);
-        let childResults = Tools.find(options.childFilter);
+        const childResults = Tools.find(options.childFilter);
         Tools.setBase(oldBase);
         return childResults.target != null;
       });
@@ -118,13 +118,13 @@ export default class Tools {
   }
 
   static find(options: any, multiple = false) {
-    let results: any[] = [];
+    const results: any[] = [];
     if (options.parent != null) {
-      let parent = Tools.findElement(options.parent, null, multiple);
+      const parent = Tools.findElement(options.parent, null, multiple);
       if (parent != null) {
         if (parent instanceof Array) {
           parent.forEach(p => {
-            let targets = Tools.findElement(options.target, p, multiple);
+            const targets = Tools.findElement(options.target, p, multiple);
             if (targets instanceof Array) {
               targets.forEach(target => {
                 results.push({
@@ -142,7 +142,7 @@ export default class Tools {
 
           return results;
         } else {
-          let targets = Tools.findElement(options.target, parent, multiple);
+          const targets = Tools.findElement(options.target, parent, multiple);
           if (targets instanceof Array) {
             targets.forEach(target => {
               results.push({
@@ -159,7 +159,7 @@ export default class Tools {
         }
       }
     } else {
-      let targets = Tools.findElement(options.target, null, multiple);
+      const targets = Tools.findElement(options.target, null, multiple);
       if (targets instanceof Array) {
         targets.forEach(target => {
           results.push({

package/lib/rule-executors.ts

@@ -10,9 +10,14 @@ export function doEval(expr: string): Promise<boolean> {
   });
 }
 
-export function click(selector: string, all = false): boolean {
-  const elem = document.querySelectorAll<HTMLElement>(selector);
-  enableLogs && console.log("[click]", selector, all, elem);
+export function click(selectorOrElements: string | HTMLElement[], all = false): boolean {
+  let elem: HTMLElement[] = [];
+  if (typeof selectorOrElements === 'string') {
+    elem = Array.from(document.querySelectorAll<HTMLElement>(selectorOrElements));
+  } else {
+    elem = selectorOrElements;
+  }
+  enableLogs && console.log("[click]", selectorOrElements, all, elem);
   if (elem.length > 0) {
     if (all) {
       elem.forEach((e) => e.click());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "3.0.4",
+  "version": "4.0.0",
   "description": "",
   "main": "dist/autoconsent.cjs.js",
   "module": "dist/autoconsent.esm.js",
@@ -9,6 +9,7 @@
   },
   "scripts": {
     "clean": "rm -r dist",
+    "lint": "eslint lib/ playwright/ tests/ rules/autoconsent/*.json",
     "bundle": "rollup -c",
     "watch": "rollup -c -w",
     "test": "playwright test",
@@ -28,16 +29,17 @@
   "license": "MPL-2.0",
   "devDependencies": {
     "@playwright/test": "^1.17.1",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-typescript": "^8.3.2",
+    "@rollup/plugin-json": "^5.0.2",
+    "@rollup/plugin-typescript": "^10.0.1",
     "@types/chai": "^4.3.1",
-    "@types/chrome": "^0.0.188",
-    "@types/mocha": "^9.1.1",
-    "@typescript-eslint/eslint-plugin": "^5.25.0",
-    "@typescript-eslint/parser": "^5.25.0",
+    "@types/chrome": "^0.0.204",
+    "@types/mocha": "^10.0.1",
+    "@typescript-eslint/eslint-plugin": "^5.42.1",
+    "@typescript-eslint/parser": "^5.42.1",
     "auto": "^10.37.6",
     "chai": "^4.2.0",
-    "eslint-config-airbnb": "^19.0.4",
+    "eslint": "^8.27.0",
+    "eslint-plugin-json": "^3.1.0",
     "mocha": "^10.0.0",
     "rollup": "^2.79.1",
     "rollup-plugin-copy": "^3.4.0",

package/rules/autoconsent/affinity-serif-com.json

@@ -2,10 +2,7 @@
   "name": "affinity.serif.com",
   "detectCmp": [
     {
-      "exists": ".c-cookie-banner"
-    },
-    {
-      "exists": ".c-cookie-banner button"
+      "exists": ".c-cookie-banner button[data-qa='allow-all-cookies']"
     }
   ],
   "detectPopup": [

package/rules/autoconsent/cookiealert.json

@@ -0,0 +1,48 @@
+{
+  "name": "cookiealert",
+  "intermediate": false,
+  "prehideSelectors": [],
+  "runContext": {
+    "frame": true,
+    "main": true
+  },
+  "detectCmp": [
+    {
+      "exists": ".cookie-alert-extended"
+    }
+  ],
+  "detectPopup": [
+    {
+      "visible": ".cookie-alert-extended-modal"
+    }
+  ],
+  "optIn": [
+    {
+      "click": "button[data-controller='cookie-alert/extended/button/accept']"
+    },
+    {
+      "eval": "document.querySelector('body').removeAttribute('style') || true"
+    }
+  ],
+  "optOut": [
+    {
+      "click": "a[data-controller='cookie-alert/extended/detail-link']"
+    },
+    {
+      "click": ".cookie-alert-configuration-input:checked",
+      "all": true,
+      "optional": true
+    },
+    {
+      "click": "button[data-controller='cookie-alert/extended/button/configuration']"
+    },
+    {
+      "eval": "document.querySelector('body').removeAttribute('style') || true"
+    }
+  ],
+  "test": [
+    {
+      "eval": "window.CookieConsent.declined === true"
+    }
+  ]
+}

package/rules/rules.json

@@ -66,10 +66,7 @@
       "name": "affinity.serif.com",
       "detectCmp": [
         {
-          "exists": ".c-cookie-banner"
-        },
-        {
-          "exists": ".c-cookie-banner button"
+          "exists": ".c-cookie-banner button[data-qa='allow-all-cookies']"
         }
       ],
       "detectPopup": [
@@ -721,6 +718,54 @@
         }
       ]
     },
+    {
+      "name": "cookiealert",
+      "intermediate": false,
+      "prehideSelectors": [],
+      "runContext": {
+        "frame": true,
+        "main": true
+      },
+      "detectCmp": [
+        {
+          "exists": ".cookie-alert-extended"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": ".cookie-alert-extended-modal"
+        }
+      ],
+      "optIn": [
+        {
+          "click": "button[data-controller='cookie-alert/extended/button/accept']"
+        },
+        {
+          "eval": "document.querySelector('body').removeAttribute('style') || true"
+        }
+      ],
+      "optOut": [
+        {
+          "click": "a[data-controller='cookie-alert/extended/detail-link']"
+        },
+        {
+          "click": ".cookie-alert-configuration-input:checked",
+          "all": true,
+          "optional": true
+        },
+        {
+          "click": "button[data-controller='cookie-alert/extended/button/configuration']"
+        },
+        {
+          "eval": "document.querySelector('body').removeAttribute('style') || true"
+        }
+      ],
+      "test": [
+        {
+          "eval": "window.CookieConsent.declined === true"
+        }
+      ]
+    },
     {
       "name": "Cookie Information Banner",
       "prehideSelectors": [

package/tests/192.spec.ts

@@ -1,7 +1,7 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('192.com', [
-    'https://192.com'], {
-        skipRegions: ["US", "FR", "DE"]
-    }
+  'https://192.com'], {
+  skipRegions: ["US", "FR", "DE"]
+}
 );

package/tests/adroll.spec.ts

@@ -1,15 +1,15 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('Adroll', [
-    'https://www.adroll.com/',
-    'https://www.appliancewhse.com/',
-    'https://www.michiganhumane.org/',
-    'https://audioplugin.deals/',
-    'https://www.mhu.edu/',
+  'https://www.adroll.com/',
+  'https://www.appliancewhse.com/',
+  'https://www.michiganhumane.org/',
+  'https://audioplugin.deals/',
+  'https://www.mhu.edu/',
 ], {
-    skipRegions: ['US']
+  skipRegions: ['US']
 });
 
 generateCMPTests('Adroll', [
-    'https://agoraeufalo.mykajabi.com/',
+  'https://agoraeufalo.mykajabi.com/',
 ], {});

package/tests/affinity-serif-com.spec.ts

@@ -1,5 +1,5 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('affinity.serif.com', [
-    'https://affinity.serif.com/en-us/photo/'
+  'https://affinity.serif.com/en-us/photo/'
 ]);

package/tests/airbnb.spec.ts

@@ -1,8 +1,8 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('airbnb', [
-    'https://airbnb.nl',
-    'https://airbnb.co.uk',
+  'https://airbnb.nl',
+  'https://airbnb.co.uk',
 ],{
-    skipRegions: ['US']
+  skipRegions: ['US']
 });

package/tests/amazon.spec.ts

@@ -1,17 +1,17 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('amazon.com', [
-    'https://www.amazon.co.uk/',
-    'https://www.amazon.de/',
-    'https://www.amazon.nl/',
+  'https://www.amazon.co.uk/',
+  'https://www.amazon.de/',
+  'https://www.amazon.nl/',
 ],{
-    mobile: true,
+  mobile: true,
 });
 
 generateCMPTests('amazon.com', [
-    'https://www.amazon.co.uk/',
-    'https://www.amazon.de/',
-    'https://www.amazon.nl/',
+  'https://www.amazon.co.uk/',
+  'https://www.amazon.de/',
+  'https://www.amazon.nl/',
 ],{
-    mobile: false,
+  mobile: false,
 });

package/tests/arzt-auskunft.spec.ts

@@ -1,7 +1,7 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('arzt-auskunft.de', [
-    'https://arzt-auskunft.de'], {
-        skipRegions: ["US", "FR", "GB"]
-    }
+  'https://arzt-auskunft.de'], {
+  skipRegions: ["US", "FR", "GB"]
+}
 );

package/tests/ausopen.spec.ts

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

package/tests/aws.amazon.spec.ts

@@ -1,7 +1,7 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('aws.amazon.com', [
-    'https://docs.aws.amazon.com'], {
-        skipRegions: ["US"]
-    }
+  'https://docs.aws.amazon.com'], {
+  skipRegions: ["US"]
+}
 );

package/tests/axeptio.spec.ts

@@ -2,8 +2,8 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('axeptio', [
-    'https://www.welcometothejungle.com/',
-    'https://frichti.co/landing?redirectTo=/',
-    'https://www.dorcel.com/'
+  'https://www.welcometothejungle.com/',
+  'https://frichti.co/landing?redirectTo=/',
+  'https://www.dorcel.com/'
 ]
 );

package/tests/baden-wuerttemberg.spec.ts

@@ -1,7 +1,7 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('baden-wuerttemberg.de', [
-    'https://baden-wuerttemberg.de'], {
-        skipRegions: ["US"]
-    }
+  'https://baden-wuerttemberg.de'], {
+  skipRegions: ["US"]
+}
 );

package/tests/borlabs.spec.ts

@@ -1,7 +1,7 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('borlabs', [
-    'https://www.experto.de/', 'https://www.kesselheld.de/'], {
-    skipRegions: ["US"]
-}
-);
+  'https://www.experto.de/', 'https://www.kesselheld.de/'
+], {
+  skipRegions: ["US"]
+});

package/tests/bundesregierung.spec.ts

@@ -1,10 +1,10 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('bundesregierung.de', [
-    'https://bundesregierung.de'], {
-        skipRegions: [
-            "US", "FR", "GB",
-            "DE" // our crawler proxy hits a bot wall, but it still passes locally
-        ]
-    }
+  'https://bundesregierung.de'], {
+  skipRegions: [
+    "US", "FR", "GB",
+    "DE" // our crawler proxy hits a bot wall, but it still passes locally
+  ]
+}
 );

package/tests/ccbanner.spec.ts

@@ -1,11 +1,11 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('cc_banner', [
-    'https://www.w3resource.com/',
-    'https://bitcoin.org/en/',
+  'https://www.w3resource.com/',
+  'https://bitcoin.org/en/',
 ])
 generateCMPTests('cc_banner', [
-    'https://distrowatch.com/',
+  'https://distrowatch.com/',
 ], {
-    skipRegions: ['US', 'GB'],
+  skipRegions: ['US', 'GB'],
 });

package/tests/clickio.spec.ts

@@ -1,10 +1,10 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('click.io', [
-    'https://www.propertywire.com/',
-    'https://pedsovet.su/',
-    'https://golftoday.co.uk/',
-    'https://www.golfshake.com/',
+  'https://www.propertywire.com/',
+  'https://pedsovet.su/',
+  'https://golftoday.co.uk/',
+  'https://www.golfshake.com/',
 ], {
-    skipRegions: ['US']
+  skipRegions: ['US']
 });

package/tests/complianz-banner.spec.ts

@@ -1,7 +1,7 @@
 import generateCMPTests from "../playwright/runner";
 
 generateCMPTests('Complianz banner', [
-    'https://bloodpressureok.com/',
-    'https://www.fussball-wm.pro/',
+  'https://bloodpressureok.com/',
+  'https://www.fussball-wm.pro/',
 ], {}
 );