@duckduckgo/autoconsent 9.5.0 → 9.6.0

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+# v9.6.0 (Wed Jan 31 2024)
+
+#### 🚀 Enhancement
+
+- Add rule for webflow [#364](https://github.com/duckduckgo/autoconsent/pull/364) ([@muodov](https://github.com/muodov))
+- Handle Tealium implicit modal [#363](https://github.com/duckduckgo/autoconsent/pull/363) ([@muodov](https://github.com/muodov))
+- Fix reddit rule [#362](https://github.com/duckduckgo/autoconsent/pull/362) ([@muodov](https://github.com/muodov))
+
+#### 🐛 Bug Fix
+
+- regression fix: Do not run opt-out unless a pop-up is actually shown [#365](https://github.com/duckduckgo/autoconsent/pull/365) ([@muodov](https://github.com/muodov))
+
+#### Authors: 1
+
+- Maxim Tsoy ([@muodov](https://github.com/muodov))
+
+---
+
 # v9.5.0 (Wed Jan 31 2024)
 
 #### 🚀 Enhancement

package/dist/addon-firefox/content.bundle.js

@@ -2065,8 +2065,14 @@
       }
       return foundCMPs;
     }
+    /**
+     * Detect if a CMP has a popup open. Fullfils with the CMP if a popup is open, otherwise rejects.
+     */
     async detectPopup(cmp) {
-      const isOpen = await this.waitForPopup(cmp);
+      const isOpen = await this.waitForPopup(cmp).catch((error) => {
+        this.config.logs.errors && console.warn(`error waiting for a popup for ${cmp.name}`, error);
+        return false;
+      });
       if (isOpen) {
         this.updateState({ detectedPopups: this.state.detectedPopups.concat([cmp.name]) });
         this.sendContentMessage({
@@ -2074,15 +2080,16 @@
           cmp: cmp.name,
           url: location.href
         });
+        return cmp;
       }
-      return cmp;
+      throw new Error("Popup is not shown");
     }
+    /**
+     * Detect if any of the CMPs has a popup open. Returns a list of CMPs with open popups.
+     */
     async detectPopups(cmps, onFirstPopupAppears) {
       const tasks = cmps.map(
-        (cmp) => this.detectPopup(cmp).catch((error) => {
-          this.config.logs.errors && console.warn(`error waiting for a popup for ${cmp.name}`, error);
-          throw error;
-        })
+        (cmp) => this.detectPopup(cmp)
       );
       await Promise.any(tasks).then((cmp) => {
         onFirstPopupAppears(cmp);

package/dist/addon-firefox/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Autoconsent",
-  "version": "2024.1.26",
+  "version": "2024.1.31",
   "background": {
     "scripts": [
       "background.bundle.js"

package/dist/addon-firefox/rules.json

@@ -4312,26 +4312,32 @@
         "urlPattern": "^https://www\\.reddit\\.com/"
       },
       "prehideSelectors": [
-        "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"])"
+        "[bundlename=reddit_cookie_banner]"
       ],
       "detectCmp": [
         {
-          "exists": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"])"
+          "exists": "reddit-cookie-banner"
         }
       ],
       "detectPopup": [
         {
-          "visible": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"])"
+          "visible": "reddit-cookie-banner"
         }
       ],
       "optIn": [
         {
-          "waitForThenClick": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"]) section[class^='_'] > section:first-child form button"
+          "waitForThenClick": [
+            "reddit-cookie-banner",
+            "#accept-all-cookies-button > button"
+          ]
         }
       ],
       "optOut": [
         {
-          "waitForThenClick": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"]) section[class^='_'] > section:last-child form button"
+          "waitForThenClick": [
+            "reddit-cookie-banner",
+            "#reject-nonessential-cookies-button > button"
+          ]
         }
       ],
       "test": [
@@ -4721,11 +4727,11 @@
     {
       "name": "Tealium",
       "prehideSelectors": [
-        "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#consent-layer"
+        "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal,#consent-layer"
       ],
       "detectCmp": [
         {
-          "exists": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *"
+          "exists": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *"
         },
         {
           "eval": "EVAL_TEALIUM_0"
@@ -4733,7 +4739,7 @@
       ],
       "detectPopup": [
         {
-          "visible": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *",
+          "visible": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *",
           "check": "any"
         }
       ],
@@ -4745,7 +4751,7 @@
           "eval": "EVAL_TEALIUM_DONOTSELL"
         },
         {
-          "hide": "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs"
+          "hide": "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal"
         },
         {
           "waitForThenClick": "#cm-acceptNone,.js-accept-essential-cookies",
@@ -5709,6 +5715,42 @@
         }
       ]
     },
+    {
+      "name": "webflow",
+      "vendorUrl": "https://webflow.com/",
+      "prehideSelectors": [
+        ".fs-cc-components"
+      ],
+      "detectCmp": [
+        {
+          "exists": ".fs-cc-components"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": ".fs-cc-components"
+        },
+        {
+          "visible": "[fs-cc=banner]"
+        }
+      ],
+      "optIn": [
+        {
+          "wait": 500
+        },
+        {
+          "waitForThenClick": "[fs-cc=banner] [fs-cc=allow]"
+        }
+      ],
+      "optOut": [
+        {
+          "wait": 500
+        },
+        {
+          "waitForThenClick": "[fs-cc=banner] [fs-cc=deny]"
+        }
+      ]
+    },
     {
       "name": "wetransfer.com",
       "detectCmp": [

package/dist/addon-mv3/content.bundle.js

@@ -2065,8 +2065,14 @@
       }
       return foundCMPs;
     }
+    /**
+     * Detect if a CMP has a popup open. Fullfils with the CMP if a popup is open, otherwise rejects.
+     */
     async detectPopup(cmp) {
-      const isOpen = await this.waitForPopup(cmp);
+      const isOpen = await this.waitForPopup(cmp).catch((error) => {
+        this.config.logs.errors && console.warn(`error waiting for a popup for ${cmp.name}`, error);
+        return false;
+      });
       if (isOpen) {
         this.updateState({ detectedPopups: this.state.detectedPopups.concat([cmp.name]) });
         this.sendContentMessage({
@@ -2074,15 +2080,16 @@
           cmp: cmp.name,
           url: location.href
         });
+        return cmp;
       }
-      return cmp;
+      throw new Error("Popup is not shown");
     }
+    /**
+     * Detect if any of the CMPs has a popup open. Returns a list of CMPs with open popups.
+     */
     async detectPopups(cmps, onFirstPopupAppears) {
       const tasks = cmps.map(
-        (cmp) => this.detectPopup(cmp).catch((error) => {
-          this.config.logs.errors && console.warn(`error waiting for a popup for ${cmp.name}`, error);
-          throw error;
-        })
+        (cmp) => this.detectPopup(cmp)
       );
       await Promise.any(tasks).then((cmp) => {
         onFirstPopupAppears(cmp);

package/dist/addon-mv3/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Autoconsent",
-  "version": "2024.1.26",
+  "version": "2024.1.31",
   "background": {
     "service_worker": "background.bundle.js"
   },

package/dist/addon-mv3/rules.json

@@ -4312,26 +4312,32 @@
         "urlPattern": "^https://www\\.reddit\\.com/"
       },
       "prehideSelectors": [
-        "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"])"
+        "[bundlename=reddit_cookie_banner]"
       ],
       "detectCmp": [
         {
-          "exists": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"])"
+          "exists": "reddit-cookie-banner"
         }
       ],
       "detectPopup": [
         {
-          "visible": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"])"
+          "visible": "reddit-cookie-banner"
         }
       ],
       "optIn": [
         {
-          "waitForThenClick": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"]) section[class^='_'] > section:first-child form button"
+          "waitForThenClick": [
+            "reddit-cookie-banner",
+            "#accept-all-cookies-button > button"
+          ]
         }
       ],
       "optOut": [
         {
-          "waitForThenClick": "section:has(a[href^=\"https://www.reddit.com/policies/cookies\"]) section[class^='_'] > section:last-child form button"
+          "waitForThenClick": [
+            "reddit-cookie-banner",
+            "#reject-nonessential-cookies-button > button"
+          ]
         }
       ],
       "test": [
@@ -4721,11 +4727,11 @@
     {
       "name": "Tealium",
       "prehideSelectors": [
-        "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#consent-layer"
+        "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal,#consent-layer"
       ],
       "detectCmp": [
         {
-          "exists": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *"
+          "exists": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *"
         },
         {
           "eval": "EVAL_TEALIUM_0"
@@ -4733,7 +4739,7 @@
       ],
       "detectPopup": [
         {
-          "visible": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *",
+          "visible": "#__tealiumGDPRecModal *,#__tealiumGDPRcpPrefs *,#__tealiumImplicitmodal *",
           "check": "any"
         }
       ],
@@ -4745,7 +4751,7 @@
           "eval": "EVAL_TEALIUM_DONOTSELL"
         },
         {
-          "hide": "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs"
+          "hide": "#__tealiumGDPRecModal,#__tealiumGDPRcpPrefs,#__tealiumImplicitmodal"
         },
         {
           "waitForThenClick": "#cm-acceptNone,.js-accept-essential-cookies",
@@ -5709,6 +5715,42 @@
         }
       ]
     },
+    {
+      "name": "webflow",
+      "vendorUrl": "https://webflow.com/",
+      "prehideSelectors": [
+        ".fs-cc-components"
+      ],
+      "detectCmp": [
+        {
+          "exists": ".fs-cc-components"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": ".fs-cc-components"
+        },
+        {
+          "visible": "[fs-cc=banner]"
+        }
+      ],
+      "optIn": [
+        {
+          "wait": 500
+        },
+        {
+          "waitForThenClick": "[fs-cc=banner] [fs-cc=allow]"
+        }
+      ],
+      "optOut": [
+        {
+          "wait": 500
+        },
+        {
+          "waitForThenClick": "[fs-cc=banner] [fs-cc=deny]"
+        }
+      ]
+    },
     {
       "name": "wetransfer.com",
       "detectCmp": [

package/dist/autoconsent.cjs.js

@@ -2088,8 +2088,14 @@ var AutoConsent = class {
     }
     return foundCMPs;
   }
+  /**
+   * Detect if a CMP has a popup open. Fullfils with the CMP if a popup is open, otherwise rejects.
+   */
   async detectPopup(cmp) {
-    const isOpen = await this.waitForPopup(cmp);
+    const isOpen = await this.waitForPopup(cmp).catch((error) => {
+      this.config.logs.errors && console.warn(`error waiting for a popup for ${cmp.name}`, error);
+      return false;
+    });
     if (isOpen) {
       this.updateState({ detectedPopups: this.state.detectedPopups.concat([cmp.name]) });
       this.sendContentMessage({
@@ -2097,15 +2103,16 @@ var AutoConsent = class {
         cmp: cmp.name,
         url: location.href
       });
+      return cmp;
     }
-    return cmp;
+    throw new Error("Popup is not shown");
   }
+  /**
+   * Detect if any of the CMPs has a popup open. Returns a list of CMPs with open popups.
+   */
   async detectPopups(cmps, onFirstPopupAppears) {
     const tasks = cmps.map(
-      (cmp) => this.detectPopup(cmp).catch((error) => {
-        this.config.logs.errors && console.warn(`error waiting for a popup for ${cmp.name}`, error);
-        throw error;
-      })
+      (cmp) => this.detectPopup(cmp)
     );
     await Promise.any(tasks).then((cmp) => {
       onFirstPopupAppears(cmp);

package/dist/autoconsent.esm.js

@@ -2063,8 +2063,14 @@ var AutoConsent = class {
     }
     return foundCMPs;
   }
+  /**
+   * Detect if a CMP has a popup open. Fullfils with the CMP if a popup is open, otherwise rejects.
+   */
   async detectPopup(cmp) {
-    const isOpen = await this.waitForPopup(cmp);
+    const isOpen = await this.waitForPopup(cmp).catch((error) => {
+      this.config.logs.errors && console.warn(`error waiting for a popup for ${cmp.name}`, error);
+      return false;
+    });
     if (isOpen) {
       this.updateState({ detectedPopups: this.state.detectedPopups.concat([cmp.name]) });
       this.sendContentMessage({
@@ -2072,15 +2078,16 @@ var AutoConsent = class {
         cmp: cmp.name,
         url: location.href
       });
+      return cmp;
     }
-    return cmp;
+    throw new Error("Popup is not shown");
   }
+  /**
+   * Detect if any of the CMPs has a popup open. Returns a list of CMPs with open popups.
+   */
   async detectPopups(cmps, onFirstPopupAppears) {
     const tasks = cmps.map(
-      (cmp) => this.detectPopup(cmp).catch((error) => {
-        this.config.logs.errors && console.warn(`error waiting for a popup for ${cmp.name}`, error);
-        throw error;
-      })
+      (cmp) => this.detectPopup(cmp)
     );
     await Promise.any(tasks).then((cmp) => {
       onFirstPopupAppears(cmp);