@duckduckgo/autoconsent 10.5.0 → 10.6.1

package/dist/autoconsent.unit.js

@@ -480,6 +480,22 @@
         return Object.keys(consents).filter((k) => optionalServices.includes(k)).every((k) => consents[k] === false);
       }
     },
+    EVAL_KLARO_OPEN_POPUP: () => {
+      klaro.show(void 0, true);
+    },
+    EVAL_KLARO_TRY_API_OPT_OUT: () => {
+      if (window.klaro && typeof klaro.show === "function" && typeof klaro.getManager === "function") {
+        try {
+          klaro.getManager().changeAll(false);
+          klaro.getManager().saveAndApplyConsents();
+          return true;
+        } catch (e) {
+          console.warn(e);
+          return false;
+        }
+      }
+      return false;
+    },
     EVAL_ONETRUST_1: () => window.OnetrustActiveGroups.split(",").filter((s) => s.length > 0).length <= 1,
     EVAL_TRUSTARC_TOP: () => window && window.truste && window.truste.eu.bindMap.prefCookie === "0",
     // declarative rules
@@ -563,7 +579,7 @@
     EVAL_TAKEALOT_0: () => document.body.classList.remove("freeze") || (document.body.style = "") || true,
     EVAL_TARTEAUCITRON_0: () => tarteaucitron.userInterface.respondAll(false) || true,
     EVAL_TARTEAUCITRON_1: () => tarteaucitron.userInterface.respondAll(true) || true,
-    EVAL_TARTEAUCITRON_2: () => document.cookie.match(/tarteaucitron=[^;]*/)[0].includes("false"),
+    EVAL_TARTEAUCITRON_2: () => document.cookie.match(/tarteaucitron=[^;]*/)?.[0].includes("false"),
     EVAL_TAUNTON_TEST: () => document.cookie.includes("taunton_user_consent_submitted=true"),
     EVAL_TEALIUM_0: () => typeof window.utag !== "undefined" && typeof utag.gdpr === "object",
     EVAL_TEALIUM_1: () => utag.gdpr.setConsentValue(false) || true,
@@ -1504,14 +1520,14 @@
       return this.elementVisible(".klaro > .cookie-notice,.klaro > .cookie-modal", "any");
     }
     async optOut() {
-      if (this.click(".klaro .cn-decline")) {
+      const apiOptOutSuccess = await this.mainWorldEval("EVAL_KLARO_TRY_API_OPT_OUT");
+      if (apiOptOutSuccess) {
         return true;
       }
-      if (!this.settingsOpen) {
-        this.click(".klaro .cn-learn-more,.klaro .cm-button-manage");
-        await this.waitForElement(".klaro > .cookie-modal", 2e3);
-        this.settingsOpen = true;
+      if (this.click(".klaro .cn-decline")) {
+        return true;
       }
+      await this.mainWorldEval("EVAL_KLARO_OPEN_POPUP");
       if (this.click(".klaro .cn-decline")) {
         return true;
       }
@@ -7909,7 +7925,7 @@
       ],
       detectPopup: [
         {
-          visible: "#tarteaucitronRoot #tarteaucitronAlertSmall,#tarteaucitronRoot #tarteaucitronAlertBig",
+          visible: "#tarteaucitronRoot #tarteaucitronAlertBig",
           check: "any"
         }
       ],

package/lib/cmps/klaro.ts

@@ -30,15 +30,18 @@ export default class Klaro extends AutoConsentCMPBase {
   }
 
   async optOut() {
+    const apiOptOutSuccess = await this.mainWorldEval("EVAL_KLARO_TRY_API_OPT_OUT")
+    if (apiOptOutSuccess) {
+      return true
+    }
+    // if the API is broken for some reason, try clicking instead
+
     if (this.click('.klaro .cn-decline')) {
       return true;
     }
 
-    if (!this.settingsOpen) {
-      this.click('.klaro .cn-learn-more,.klaro .cm-button-manage');
-      await this.waitForElement('.klaro > .cookie-modal', 2000);
-      this.settingsOpen = true;
-    }
+    // open popup via Javascript API
+    await this.mainWorldEval("EVAL_KLARO_OPEN_POPUP")
 
     if (this.click('.klaro .cn-decline')) {
       return true;

package/lib/eval-snippets.ts

@@ -30,6 +30,23 @@ export const snippets = {
       return Object.keys(consents).filter(k => optionalServices.includes(k)).every(k => consents[k] === false)
     }
   },
+  EVAL_KLARO_OPEN_POPUP: () => {
+    klaro.show(undefined, true)
+  },
+  EVAL_KLARO_TRY_API_OPT_OUT: () => {
+    if (window.klaro && typeof klaro.show === 'function' && typeof klaro.getManager === 'function') {
+      try {
+        // opt-out directly via API
+        klaro.getManager().changeAll(false)
+        klaro.getManager().saveAndApplyConsents()
+        return true
+      } catch (e) {
+        console.warn(e)
+        return false
+      }
+    }
+    return false
+  },
   EVAL_ONETRUST_1: () => window.OnetrustActiveGroups.split(',').filter(s => s.length > 0).length <= 1,
   EVAL_TRUSTARC_TOP: () => window && window.truste && window.truste.eu.bindMap.prefCookie === '0',
 
@@ -105,7 +122,7 @@ export const snippets = {
   EVAL_TAKEALOT_0: () => document.body.classList.remove('freeze') || (document.body.style = '') || true,
   EVAL_TARTEAUCITRON_0: () => tarteaucitron.userInterface.respondAll(false) || true,
   EVAL_TARTEAUCITRON_1: () => tarteaucitron.userInterface.respondAll(true) || true,
-  EVAL_TARTEAUCITRON_2: () => document.cookie.match(/tarteaucitron=[^;]*/)[0].includes('false'),
+  EVAL_TARTEAUCITRON_2: () => document.cookie.match(/tarteaucitron=[^;]*/)?.[0].includes('false'),
   EVAL_TAUNTON_TEST: () => document.cookie.includes('taunton_user_consent_submitted=true'),
   EVAL_TEALIUM_0: () => typeof window.utag !== 'undefined' && typeof utag.gdpr === 'object',
   EVAL_TEALIUM_1: () => utag.gdpr.setConsentValue(false) || true,

package/package.json

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

package/rules/autoconsent/tarteaucitron.json

@@ -3,7 +3,7 @@
   "prehideSelectors": ["#tarteaucitronRoot"],
   "detectCmp": [{ "exists": "#tarteaucitronRoot" }],
   "detectPopup": [{
-    "visible": "#tarteaucitronRoot #tarteaucitronAlertSmall,#tarteaucitronRoot #tarteaucitronAlertBig",
+    "visible": "#tarteaucitronRoot #tarteaucitronAlertBig",
     "check": "any"
   }],
   "optIn": [

package/rules/rules.json

@@ -5549,7 +5549,7 @@
       ],
       "detectPopup": [
         {
-          "visible": "#tarteaucitronRoot #tarteaucitronAlertSmall,#tarteaucitronRoot #tarteaucitronAlertBig",
+          "visible": "#tarteaucitronRoot #tarteaucitronAlertBig",
           "check": "any"
         }
       ],