@duckduckgo/autoconsent 9.3.0 → 9.4.0

package/dist/autoconsent.unit.js

@@ -487,6 +487,7 @@
     EVAL_ALMACMP_0: () => document.cookie.includes('"name":"Google","consent":false'),
     EVAL_AFFINITY_SERIF_COM_0: () => document.cookie.includes("serif_manage_cookies_viewed") && !document.cookie.includes("serif_allow_analytics"),
     EVAL_AXEPTIO_0: () => document.cookie.includes("axeptio_authorized_vendors=%2C%2C"),
+    EVAL_BAHN_TEST: () => utag.gdpr.getSelectedCategories().length === 1,
     EVAL_BING_0: () => document.cookie.includes("AL=0") && document.cookie.includes("AD=0") && document.cookie.includes("SM=0"),
     EVAL_BLOCKSY_0: () => document.cookie.includes("blocksy_cookies_consent_accepted=no"),
     EVAL_BORLABS_0: () => !JSON.parse(decodeURIComponent(document.cookie.split(";").find((c) => c.indexOf("borlabs-cookie") !== -1).split("=", 2)[1])).consents.statistics,
@@ -497,8 +498,6 @@
     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,
     EVAL_COMPLIANZ_BANNER_0: () => document.cookie.includes("cmplz_banner-status=dismissed"),
-    EVAL_COMPLIANZ_CATEGORIES_0: () => !!document.cookie.match(/cmplz_[^=]+=deny/),
-    EVAL_COMPLIANZ_OPTIN_0: () => !!document.cookie.match(/cookieconsent_preferences_disabled=[^;]+/),
     EVAL_COOKIE_LAW_INFO_0: () => CLI.disableAllCookies() || CLI.reject_close() || true,
     EVAL_COOKIE_LAW_INFO_1: () => document.cookie.indexOf("cookielawinfo-checkbox-non-necessary=yes") === -1,
     EVAL_COOKIE_MANAGER_POPUP_0: () => JSON.parse(document.cookie.split(";").find((c) => c.trim().startsWith("CookieLevel")).split("=")[1]).social === false,
@@ -1289,7 +1288,7 @@
           this.waitForElement(".pm-features", 2e3).then((success) => success ? 2 : -1)
         ]);
         if (path === 0) {
-          await this.wait(1e3);
+          await this.wait(1500);
           return this.click(rejectSelector1);
         } else if (path === 1) {
           this.click(rejectSelector2);
@@ -2793,6 +2792,55 @@
         }
       ]
     },
+    {
+      name: "bahn-de",
+      vendorUrl: "https://www.bahn.de/",
+      cosmetic: false,
+      runContext: {
+        main: true,
+        frame: false,
+        urlPattern: "^https://(www\\.)?bahn\\.de/"
+      },
+      intermediate: false,
+      prehideSelectors: [],
+      detectCmp: [
+        {
+          exists: [
+            "body > div:first-child",
+            "#consent-layer"
+          ]
+        }
+      ],
+      detectPopup: [
+        {
+          visible: [
+            "body > div:first-child",
+            "#consent-layer"
+          ]
+        }
+      ],
+      optIn: [
+        {
+          waitForThenClick: [
+            "body > div:first-child",
+            "#consent-layer .js-accept-all-cookies"
+          ]
+        }
+      ],
+      optOut: [
+        {
+          waitForThenClick: [
+            "body > div:first-child",
+            "#consent-layer .js-accept-essential-cookies"
+          ]
+        }
+      ],
+      test: [
+        {
+          eval: "EVAL_BAHN_TEST"
+        }
+      ]
+    },
     {
       name: "bbb.org",
       runContext: {
@@ -3460,26 +3508,42 @@
       ],
       optIn: [
         {
-          click: ".cc-accept-all",
-          optional: true
-        },
-        {
-          click: ".cc-allow",
-          optional: true
-        },
-        {
-          click: ".cc-dismiss",
-          optional: true
+          any: [
+            {
+              click: ".cc-accept-all"
+            },
+            {
+              click: ".cc-allow-all"
+            },
+            {
+              click: ".cc-allow"
+            },
+            {
+              click: ".cc-dismiss"
+            }
+          ]
         }
       ],
       optOut: [
         {
-          click: ".cc-dismiss"
-        }
-      ],
-      test: [
-        {
-          eval: "EVAL_COMPLIANZ_CATEGORIES_0"
+          if: {
+            exists: '.cc-type-categories[aria-describedby="cookieconsent:desc"] .cc-dismiss'
+          },
+          then: [
+            {
+              click: ".cc-dismiss"
+            }
+          ],
+          else: [
+            {
+              click: ".cc-type-categories input[type=checkbox]:not([disabled]):checked",
+              all: true,
+              optional: true
+            },
+            {
+              click: ".cc-save"
+            }
+          ]
         }
       ]
     },
@@ -3491,12 +3555,12 @@
       cosmetic: true,
       detectCmp: [
         {
-          exists: '.cc-type-info[aria-describedby="cookieconsent:desc"]'
+          exists: '.cc-type-info[aria-describedby="cookieconsent:desc"] .cc-compliance .cc-btn'
         }
       ],
       detectPopup: [
         {
-          visible: '.cc-type-info[aria-describedby="cookieconsent:desc"]'
+          visible: '.cc-type-info[aria-describedby="cookieconsent:desc"] .cc-compliance .cc-btn'
         }
       ],
       optIn: [
@@ -3515,23 +3579,35 @@
       ],
       optOut: [
         {
-          hide: '[aria-describedby="cookieconsent:desc"]'
+          if: {
+            exists: ".cc-deny"
+          },
+          then: [
+            {
+              click: ".cc-deny"
+            }
+          ],
+          else: [
+            {
+              hide: '[aria-describedby="cookieconsent:desc"]'
+            }
+          ]
         }
       ]
     },
     {
-      name: "Complianz optin",
+      name: "Complianz opt-both",
       prehideSelectors: [
-        '.cc-type-opt-in[aria-describedby="cookieconsent:desc"]'
+        '[aria-describedby="cookieconsent:desc"] .cc-type-opt-both'
       ],
       detectCmp: [
         {
-          exists: '.cc-type-opt-in[aria-describedby="cookieconsent:desc"]'
+          exists: '[aria-describedby="cookieconsent:desc"] .cc-type-opt-both'
         }
       ],
       detectPopup: [
         {
-          visible: '.cc-type-opt-in[aria-describedby="cookieconsent:desc"]'
+          visible: '[aria-describedby="cookieconsent:desc"] .cc-type-opt-both'
         }
       ],
       optIn: [
@@ -3550,24 +3626,78 @@
       ],
       optOut: [
         {
-          click: ".cc-settings"
-        },
+          waitForThenClick: ".cc-deny"
+        }
+      ]
+    },
+    {
+      name: "Complianz optin",
+      prehideSelectors: [
+        '.cc-type-opt-in[aria-describedby="cookieconsent:desc"]'
+      ],
+      detectCmp: [
         {
-          waitForVisible: '[aria-label="cookies preferences popup"]'
-        },
+          exists: '.cc-type-opt-in[aria-describedby="cookieconsent:desc"]'
+        }
+      ],
+      detectPopup: [
         {
-          click: '[aria-label="cookies preferences popup"] input[type=checkbox]:not([disabled]):checked',
-          all: true,
-          optional: true
-        },
+          visible: '.cc-type-opt-in[aria-describedby="cookieconsent:desc"]'
+        }
+      ],
+      optIn: [
         {
-          click: '[aria-label="cookies preferences popup"] [aria-label="Accept Selected"], [aria-label="cookies preferences popup"] [aria-label="Save my choice"], .cc-btn-accept-selected, .cc-deny',
-          optional: true
+          any: [
+            {
+              click: ".cc-accept-all"
+            },
+            {
+              click: ".cc-allow"
+            },
+            {
+              click: ".cc-dismiss"
+            }
+          ]
         }
       ],
-      test: [
+      optOut: [
         {
-          eval: "EVAL_COMPLIANZ_OPTIN_0"
+          if: {
+            visible: ".cc-deny"
+          },
+          then: [
+            {
+              click: ".cc-deny"
+            }
+          ],
+          else: [
+            {
+              if: {
+                visible: ".cc-settings"
+              },
+              then: [
+                {
+                  waitForThenClick: ".cc-settings"
+                },
+                {
+                  waitForVisible: ".cc-settings-view"
+                },
+                {
+                  click: ".cc-settings-view input[type=checkbox]:not([disabled]):checked",
+                  all: true,
+                  optional: true
+                },
+                {
+                  click: ".cc-settings-view .cc-btn-accept-selected"
+                }
+              ],
+              else: [
+                {
+                  click: ".cc-dismiss"
+                }
+              ]
+            }
+          ]
         }
       ]
     },
@@ -5903,9 +6033,8 @@
     {
       name: "osano",
       prehideSelectors: [
-        ".osano-cm-window"
+        ".osano-cm-window,.osano-cm-dialog"
       ],
-      cosmetic: true,
       detectCmp: [
         {
           exists: ".osano-cm-window"
@@ -5924,7 +6053,7 @@
       ],
       optOut: [
         {
-          hide: ".osano-cm-window"
+          waitForThenClick: ".osano-cm-denyAll"
         }
       ]
     },

package/lib/cmps/sourcepoint-frame.ts

@@ -117,7 +117,7 @@ export default class SourcePoint extends AutoConsentCMPBase {
         this.waitForElement('.pm-features', 2000).then(success => success ? 2: -1),
       ]);
       if (path === 0) {
-        await this.wait(1000);
+        await this.wait(1500);
         return this.click(rejectSelector1);
       } else if (path === 1) {
         this.click(rejectSelector2);

package/lib/eval-snippets.ts

@@ -38,6 +38,7 @@ export const snippets = {
   EVAL_ALMACMP_0: () => document.cookie.includes('"name":"Google","consent":false'),
   EVAL_AFFINITY_SERIF_COM_0: () => document.cookie.includes('serif_manage_cookies_viewed') && !document.cookie.includes('serif_allow_analytics'),
   EVAL_AXEPTIO_0: () => document.cookie.includes('axeptio_authorized_vendors=%2C%2C'),
+  EVAL_BAHN_TEST: () => utag.gdpr.getSelectedCategories().length === 1,
   EVAL_BING_0: () => document.cookie.includes('AL=0') && document.cookie.includes('AD=0') && document.cookie.includes('SM=0'),
   EVAL_BLOCKSY_0: () => document.cookie.includes('blocksy_cookies_consent_accepted=no'),
   EVAL_BORLABS_0: () => !JSON.parse(decodeURIComponent(document.cookie.split(';').find(c => c.indexOf('borlabs-cookie') !== -1).split('=', 2)[1])).consents.statistics,
@@ -48,8 +49,6 @@ export const snippets = {
   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,
   EVAL_COMPLIANZ_BANNER_0: () => document.cookie.includes('cmplz_banner-status=dismissed'),
-  EVAL_COMPLIANZ_CATEGORIES_0: () => !!document.cookie.match(/cmplz_[^=]+=deny/),
-  EVAL_COMPLIANZ_OPTIN_0: () => !!document.cookie.match(/cookieconsent_preferences_disabled=[^;]+/),
   EVAL_COOKIE_LAW_INFO_0: () => CLI.disableAllCookies() || CLI.reject_close() || true,
   EVAL_COOKIE_LAW_INFO_1: () => document.cookie.indexOf('cookielawinfo-checkbox-non-necessary=yes') === -1,
   EVAL_COOKIE_MANAGER_POPUP_0: () => JSON.parse(document.cookie.split(';').find(c => c.trim().startsWith('CookieLevel')).split('=')[1]).social === false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duckduckgo/autoconsent",
-  "version": "9.3.0",
+  "version": "9.4.0",
   "description": "",
   "main": "dist/autoconsent.cjs.js",
   "module": "dist/autoconsent.esm.js",

package/rules/autoconsent/bahn-de.json

@@ -0,0 +1,47 @@
+{
+  "name": "bahn-de",
+  "vendorUrl": "https://www.bahn.de/",
+  "cosmetic": false,
+  "runContext": {
+    "main": true,
+    "frame": false,
+    "urlPattern": "^https://(www\\.)?bahn\\.de/"
+  },
+  "intermediate": false,
+  "prehideSelectors": [],
+  "detectCmp": [
+    {
+      "exists": [
+        "body > div:first-child",
+        "#consent-layer"
+      ]
+    }
+  ],
+  "detectPopup": [
+    {
+      "visible": [
+        "body > div:first-child",
+        "#consent-layer"
+      ]
+    }
+  ],
+  "optIn": [
+    {
+      "waitForThenClick": [
+        "body > div:first-child",
+        "#consent-layer .js-accept-all-cookies"
+      ]
+    }
+  ],
+  "optOut": [
+    {
+      "waitForThenClick": [
+        "body > div:first-child",
+        "#consent-layer .js-accept-essential-cookies"
+      ]
+    }
+  ],
+  "test": [
+    { "eval": "EVAL_BAHN_TEST" }
+  ]
+}

package/rules/autoconsent/complianz-categories.json

@@ -4,14 +4,23 @@
     "detectCmp": [{ "exists": ".cc-type-categories[aria-describedby=\"cookieconsent:desc\"]" }],
     "detectPopup": [{ "visible": ".cc-type-categories[aria-describedby=\"cookieconsent:desc\"]" }],
     "optIn": [
-        { "click": ".cc-accept-all", "optional": true },
-        { "click": ".cc-allow", "optional": true },
-        { "click": ".cc-dismiss", "optional": true }
+        {
+            "any": [
+                { "click": ".cc-accept-all" },
+                { "click": ".cc-allow-all" },
+                { "click": ".cc-allow" },
+                { "click": ".cc-dismiss" }
+            ]
+        }
     ],
     "optOut": [
-        { "click": ".cc-dismiss" }
-    ],
-    "test": [
-        { "eval": "EVAL_COMPLIANZ_CATEGORIES_0" }
+        {
+            "if": { "exists": ".cc-type-categories[aria-describedby=\"cookieconsent:desc\"] .cc-dismiss" },
+            "then": [{ "click": ".cc-dismiss" }],
+            "else": [
+                { "click": ".cc-type-categories input[type=checkbox]:not([disabled]):checked", "all": true, "optional": true },
+                { "click": ".cc-save" }
+            ]
+        }
     ]
 }

package/rules/autoconsent/complianz-notice.json

@@ -2,14 +2,20 @@
     "name": "Complianz notice",
     "prehideSelectors": [".cc-type-info[aria-describedby=\"cookieconsent:desc\"]"],
     "cosmetic": true,
-    "detectCmp": [{ "exists": ".cc-type-info[aria-describedby=\"cookieconsent:desc\"]" }],
-    "detectPopup": [{ "visible": ".cc-type-info[aria-describedby=\"cookieconsent:desc\"]" }],
+    "detectCmp": [{ "exists": ".cc-type-info[aria-describedby=\"cookieconsent:desc\"] .cc-compliance .cc-btn" }],
+    "detectPopup": [{ "visible": ".cc-type-info[aria-describedby=\"cookieconsent:desc\"] .cc-compliance .cc-btn" }],
     "optIn": [
         { "click": ".cc-accept-all", "optional": true },
         { "click": ".cc-allow", "optional": true },
         { "click": ".cc-dismiss", "optional": true }
     ],
     "optOut": [
-        { "hide": "[aria-describedby=\"cookieconsent:desc\"]" }
+        {
+            "if": { "exists": ".cc-deny" },
+            "then": [{ "click": ".cc-deny" }],
+            "else": [
+                { "hide": "[aria-describedby=\"cookieconsent:desc\"]" }
+            ]
+        }
     ]
 }

package/rules/autoconsent/complianz-opt-both.json

@@ -0,0 +1,14 @@
+{
+    "name": "Complianz opt-both",
+    "prehideSelectors": ["[aria-describedby=\"cookieconsent:desc\"] .cc-type-opt-both"],
+    "detectCmp": [{ "exists": "[aria-describedby=\"cookieconsent:desc\"] .cc-type-opt-both" }],
+    "detectPopup": [{ "visible": "[aria-describedby=\"cookieconsent:desc\"] .cc-type-opt-both" }],
+    "optIn": [
+        { "click": ".cc-accept-all", "optional": true },
+        { "click": ".cc-allow", "optional": true },
+        { "click": ".cc-dismiss", "optional": true }
+    ],
+    "optOut": [
+        { "waitForThenClick": ".cc-deny" }
+    ]
+}

package/rules/autoconsent/complianz-optin.json

@@ -4,17 +4,30 @@
     "detectCmp": [{ "exists": ".cc-type-opt-in[aria-describedby=\"cookieconsent:desc\"]" }],
     "detectPopup": [{ "visible": ".cc-type-opt-in[aria-describedby=\"cookieconsent:desc\"]" }],
     "optIn": [
-        { "click": ".cc-accept-all", "optional": true },
-        { "click": ".cc-allow", "optional": true },
-        { "click": ".cc-dismiss", "optional": true }
+        {
+            "any": [
+                { "click": ".cc-accept-all" },
+                { "click": ".cc-allow" },
+                { "click": ".cc-dismiss" }
+            ]
+        }
     ],
     "optOut": [
-        { "click": ".cc-settings" },
-        { "waitForVisible": "[aria-label=\"cookies preferences popup\"]" },
-        { "click": "[aria-label=\"cookies preferences popup\"] input[type=checkbox]:not([disabled]):checked", "all": true, "optional": true },
-        { "click": "[aria-label=\"cookies preferences popup\"] [aria-label=\"Accept Selected\"], [aria-label=\"cookies preferences popup\"] [aria-label=\"Save my choice\"], .cc-btn-accept-selected, .cc-deny", "optional": true }
-    ],
-    "test": [
-        { "eval": "EVAL_COMPLIANZ_OPTIN_0" }
+        {
+            "if": { "visible": ".cc-deny" },
+            "then": [{ "click": ".cc-deny" }],
+            "else": [{
+                "if": {"visible": ".cc-settings"},
+                "then": [
+                    { "waitForThenClick": ".cc-settings" },
+                    { "waitForVisible": ".cc-settings-view"},
+                    { "click": ".cc-settings-view input[type=checkbox]:not([disabled]):checked", "all": true, "optional": true },
+                    { "click": ".cc-settings-view .cc-btn-accept-selected" }
+                ],
+                "else": [
+                    { "click": ".cc-dismiss" }
+                ]
+            }]
+        }
     ]
 }

package/rules/autoconsent/osano.json

@@ -1,7 +1,6 @@
 {
     "name": "osano",
-    "prehideSelectors": [".osano-cm-window"],
-    "cosmetic": true,
+    "prehideSelectors": [".osano-cm-window,.osano-cm-dialog"],
     "detectCmp": [{ "exists": ".osano-cm-window" }],
     "detectPopup": [{ "visible": ".osano-cm-dialog" }],
     "optIn": [{
@@ -9,6 +8,6 @@
         "optional": true
     }],
     "optOut": [
-        { "hide": ".osano-cm-window" }
+        { "waitForThenClick": ".osano-cm-denyAll" }
     ]
-  }
+}