@duckduckgo/autoconsent 10.16.0 → 10.17.0

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+# v10.17.0 (Thu Oct 24 2024)
+
+#### 🚀 Enhancement
+
+- Add rule for americanexpress [#503](https://github.com/duckduckgo/autoconsent/pull/503) ([@muodov](https://github.com/muodov))
+- Fix race condition in Sourcepoint rule [#502](https://github.com/duckduckgo/autoconsent/pull/502) ([@muodov](https://github.com/muodov))
+- Add a rule for android.com [#501](https://github.com/duckduckgo/autoconsent/pull/501) ([@muodov](https://github.com/muodov))
+
+#### 🐛 Bug Fix
+
+- Fix standalone google for international regions [#500](https://github.com/duckduckgo/autoconsent/pull/500) ([@muodov](https://github.com/muodov))
+- Fix paypal-us [#499](https://github.com/duckduckgo/autoconsent/pull/499) ([@muodov](https://github.com/muodov))
+- (DomActions) WTR tests for elementSelector() [#495](https://github.com/duckduckgo/autoconsent/pull/495) (frei.ondrej@pm.me [@freiondrej](https://github.com/freiondrej))
+
+#### Authors: 3
+
+- Maxim Tsoy ([@muodov](https://github.com/muodov))
+- Ondřej Frei ([@freiondrej](https://github.com/freiondrej))
+- ondrej.frei (frei.ondrej@pm.me)
+
+---
+
 # v10.16.0 (Tue Oct 15 2024)
 
 #### 🚀 Enhancement

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

@@ -1332,7 +1332,7 @@
           this.waitForElement(".pm-features", 2e3).then((success) => success ? 2 : -1)
         ]);
         if (path === 0) {
-          await this.wait(1500);
+          await this.waitForVisible(rejectSelector1);
           return this.click(rejectSelector1);
         } else if (path === 1) {
           this.click(rejectSelector2);
@@ -1951,6 +1951,7 @@
     waitForVisible(selector, timeout = 1e4, check = "any") {
       const interval = 200;
       const times = Math.ceil(timeout / interval);
+      this.autoconsentInstance.config.logs.rulesteps && console.log("[waitForVisible]", selector);
       return waitFor(
         () => this.elementVisible(selector, check),
         times,
@@ -1962,6 +1963,7 @@
       return this.click(selector, all);
     }
     wait(ms) {
+      this.autoconsentInstance.config.logs.rulesteps && console.log("[wait]", ms);
       return new Promise((resolve) => {
         setTimeout(() => {
           resolve(true);
@@ -1969,6 +1971,7 @@
       });
     }
     hide(selector, method) {
+      this.autoconsentInstance.config.logs.rulesteps && console.log("[hide]", selector);
       const styleEl = getStyleElement();
       return hideElements(styleEl, selector, method);
     }

package/dist/addon-firefox/manifest.json

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

package/dist/addon-firefox/rules.json

@@ -489,6 +489,34 @@
         }
       ]
     },
+    {
+      "name": "amex",
+      "vendorUrl": "https://www.americanexpress.com/",
+      "cosmetic": false,
+      "prehideSelectors": [
+        "#user-consent-management-granular-banner-overlay"
+      ],
+      "detectCmp": [
+        {
+          "exists": "#user-consent-management-granular-banner-overlay"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": "#user-consent-management-granular-banner-overlay"
+        }
+      ],
+      "optIn": [
+        {
+          "waitForThenClick": "[data-testid=granular-banner-button-accept-all]"
+        }
+      ],
+      "optOut": [
+        {
+          "waitForThenClick": "[data-testid=granular-banner-button-decline-all]"
+        }
+      ]
+    },
     {
       "name": "aquasana.com",
       "prehideSelectors": [
@@ -3302,7 +3330,7 @@
           "exists": "a[href^=\"https://policies.google.com/technologies/cookies\""
         },
         {
-          "exists": "form[action^=\"https://consent.google.\"][action$=\".com/save\"]"
+          "exists": "form[action^=\"https://consent.google.\"][action$=\"/save\"]"
         }
       ],
       "detectPopup": [
@@ -3312,15 +3340,56 @@
       ],
       "optIn": [
         {
-          "waitForThenClick": "form[action^=\"https://consent.google.\"][action$=\".com/save\"]:has(input[name=set_eom][value=false]) button"
+          "waitForThenClick": "form[action^=\"https://consent.google.\"][action$=\"/save\"]:has(input[name=set_eom][value=false]) button"
         }
       ],
       "optOut": [
         {
-          "waitForThenClick": "form[action^=\"https://consent.google.\"][action$=\".com/save\"]:has(input[name=set_eom][value=true]) button"
+          "waitForThenClick": "form[action^=\"https://consent.google.\"][action$=\"/save\"]:has(input[name=set_eom][value=true]) button"
         }
       ]
     },
+    {
+      "name": "google-cookiebar",
+      "vendorUrl": "https://www.android.com/better-together/quick-share-app/",
+      "cosmetic": false,
+      "prehideSelectors": [
+        ".glue-cookie-notification-bar"
+      ],
+      "detectCmp": [
+        {
+          "exists": ".glue-cookie-notification-bar"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": ".glue-cookie-notification-bar"
+        }
+      ],
+      "optIn": [
+        {
+          "waitForThenClick": ".glue-cookie-notification-bar__accept"
+        }
+      ],
+      "optOut": [
+        {
+          "if": {
+            "exists": ".glue-cookie-notification-bar__reject"
+          },
+          "then": [
+            {
+              "click": ".glue-cookie-notification-bar__reject"
+            }
+          ],
+          "else": [
+            {
+              "hide": ".glue-cookie-notification-bar"
+            }
+          ]
+        }
+      ],
+      "test": []
+    },
     {
       "name": "google.com",
       "prehideSelectors": [
@@ -5201,7 +5270,7 @@
       ],
       "detectPopup": [
         {
-          "exists": "#ccpaCookieBanner, .privacy-sheet-content"
+          "visible": "#ccpaCookieBanner, .privacy-sheet-content"
         }
       ],
       "optIn": [
@@ -5239,7 +5308,7 @@
                   "optional": true
                 },
                 {
-                  "click": ".confirmCookie #submitCookiesBtn"
+                  "click": ".cookieAction.saveCookie,.confirmCookie #submitCookiesBtn"
                 }
               ]
             }

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

@@ -1332,7 +1332,7 @@
           this.waitForElement(".pm-features", 2e3).then((success) => success ? 2 : -1)
         ]);
         if (path === 0) {
-          await this.wait(1500);
+          await this.waitForVisible(rejectSelector1);
           return this.click(rejectSelector1);
         } else if (path === 1) {
           this.click(rejectSelector2);
@@ -1951,6 +1951,7 @@
     waitForVisible(selector, timeout = 1e4, check = "any") {
       const interval = 200;
       const times = Math.ceil(timeout / interval);
+      this.autoconsentInstance.config.logs.rulesteps && console.log("[waitForVisible]", selector);
       return waitFor(
         () => this.elementVisible(selector, check),
         times,
@@ -1962,6 +1963,7 @@
       return this.click(selector, all);
     }
     wait(ms) {
+      this.autoconsentInstance.config.logs.rulesteps && console.log("[wait]", ms);
       return new Promise((resolve) => {
         setTimeout(() => {
           resolve(true);
@@ -1969,6 +1971,7 @@
       });
     }
     hide(selector, method) {
+      this.autoconsentInstance.config.logs.rulesteps && console.log("[hide]", selector);
       const styleEl = getStyleElement();
       return hideElements(styleEl, selector, method);
     }

package/dist/addon-mv3/manifest.json

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

package/dist/addon-mv3/rules.json

@@ -489,6 +489,34 @@
         }
       ]
     },
+    {
+      "name": "amex",
+      "vendorUrl": "https://www.americanexpress.com/",
+      "cosmetic": false,
+      "prehideSelectors": [
+        "#user-consent-management-granular-banner-overlay"
+      ],
+      "detectCmp": [
+        {
+          "exists": "#user-consent-management-granular-banner-overlay"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": "#user-consent-management-granular-banner-overlay"
+        }
+      ],
+      "optIn": [
+        {
+          "waitForThenClick": "[data-testid=granular-banner-button-accept-all]"
+        }
+      ],
+      "optOut": [
+        {
+          "waitForThenClick": "[data-testid=granular-banner-button-decline-all]"
+        }
+      ]
+    },
     {
       "name": "aquasana.com",
       "prehideSelectors": [
@@ -3302,7 +3330,7 @@
           "exists": "a[href^=\"https://policies.google.com/technologies/cookies\""
         },
         {
-          "exists": "form[action^=\"https://consent.google.\"][action$=\".com/save\"]"
+          "exists": "form[action^=\"https://consent.google.\"][action$=\"/save\"]"
         }
       ],
       "detectPopup": [
@@ -3312,15 +3340,56 @@
       ],
       "optIn": [
         {
-          "waitForThenClick": "form[action^=\"https://consent.google.\"][action$=\".com/save\"]:has(input[name=set_eom][value=false]) button"
+          "waitForThenClick": "form[action^=\"https://consent.google.\"][action$=\"/save\"]:has(input[name=set_eom][value=false]) button"
         }
       ],
       "optOut": [
         {
-          "waitForThenClick": "form[action^=\"https://consent.google.\"][action$=\".com/save\"]:has(input[name=set_eom][value=true]) button"
+          "waitForThenClick": "form[action^=\"https://consent.google.\"][action$=\"/save\"]:has(input[name=set_eom][value=true]) button"
         }
       ]
     },
+    {
+      "name": "google-cookiebar",
+      "vendorUrl": "https://www.android.com/better-together/quick-share-app/",
+      "cosmetic": false,
+      "prehideSelectors": [
+        ".glue-cookie-notification-bar"
+      ],
+      "detectCmp": [
+        {
+          "exists": ".glue-cookie-notification-bar"
+        }
+      ],
+      "detectPopup": [
+        {
+          "visible": ".glue-cookie-notification-bar"
+        }
+      ],
+      "optIn": [
+        {
+          "waitForThenClick": ".glue-cookie-notification-bar__accept"
+        }
+      ],
+      "optOut": [
+        {
+          "if": {
+            "exists": ".glue-cookie-notification-bar__reject"
+          },
+          "then": [
+            {
+              "click": ".glue-cookie-notification-bar__reject"
+            }
+          ],
+          "else": [
+            {
+              "hide": ".glue-cookie-notification-bar"
+            }
+          ]
+        }
+      ],
+      "test": []
+    },
     {
       "name": "google.com",
       "prehideSelectors": [
@@ -5201,7 +5270,7 @@
       ],
       "detectPopup": [
         {
-          "exists": "#ccpaCookieBanner, .privacy-sheet-content"
+          "visible": "#ccpaCookieBanner, .privacy-sheet-content"
         }
       ],
       "optIn": [
@@ -5239,7 +5308,7 @@
                   "optional": true
                 },
                 {
-                  "click": ".confirmCookie #submitCookiesBtn"
+                  "click": ".cookieAction.saveCookie,.confirmCookie #submitCookiesBtn"
                 }
               ]
             }

package/dist/autoconsent.cjs.js

@@ -1355,7 +1355,7 @@ var SourcePoint = class extends AutoConsentCMPBase {
         this.waitForElement(".pm-features", 2e3).then((success) => success ? 2 : -1)
       ]);
       if (path === 0) {
-        await this.wait(1500);
+        await this.waitForVisible(rejectSelector1);
         return this.click(rejectSelector1);
       } else if (path === 1) {
         this.click(rejectSelector2);
@@ -1974,6 +1974,7 @@ var DomActions = class {
   waitForVisible(selector, timeout = 1e4, check = "any") {
     const interval = 200;
     const times = Math.ceil(timeout / interval);
+    this.autoconsentInstance.config.logs.rulesteps && console.log("[waitForVisible]", selector);
     return waitFor(
       () => this.elementVisible(selector, check),
       times,
@@ -1985,6 +1986,7 @@ var DomActions = class {
     return this.click(selector, all);
   }
   wait(ms) {
+    this.autoconsentInstance.config.logs.rulesteps && console.log("[wait]", ms);
     return new Promise((resolve) => {
       setTimeout(() => {
         resolve(true);
@@ -1992,6 +1994,7 @@ var DomActions = class {
     });
   }
   hide(selector, method) {
+    this.autoconsentInstance.config.logs.rulesteps && console.log("[hide]", selector);
     const styleEl = getStyleElement();
     return hideElements(styleEl, selector, method);
   }

package/dist/autoconsent.esm.js

@@ -1330,7 +1330,7 @@ var SourcePoint = class extends AutoConsentCMPBase {
         this.waitForElement(".pm-features", 2e3).then((success) => success ? 2 : -1)
       ]);
       if (path === 0) {
-        await this.wait(1500);
+        await this.waitForVisible(rejectSelector1);
         return this.click(rejectSelector1);
       } else if (path === 1) {
         this.click(rejectSelector2);
@@ -1949,6 +1949,7 @@ var DomActions = class {
   waitForVisible(selector, timeout = 1e4, check = "any") {
     const interval = 200;
     const times = Math.ceil(timeout / interval);
+    this.autoconsentInstance.config.logs.rulesteps && console.log("[waitForVisible]", selector);
     return waitFor(
       () => this.elementVisible(selector, check),
       times,
@@ -1960,6 +1961,7 @@ var DomActions = class {
     return this.click(selector, all);
   }
   wait(ms) {
+    this.autoconsentInstance.config.logs.rulesteps && console.log("[wait]", ms);
     return new Promise((resolve) => {
       setTimeout(() => {
         resolve(true);
@@ -1967,6 +1969,7 @@ var DomActions = class {
     });
   }
   hide(selector, method) {
+    this.autoconsentInstance.config.logs.rulesteps && console.log("[hide]", selector);
     const styleEl = getStyleElement();
     return hideElements(styleEl, selector, method);
   }