@duckduckgo/autoconsent 10.7.0 → 10.8.0

package/dist/autoconsent.unit.js

@@ -498,6 +498,8 @@
     },
     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",
+    EVAL_TRUSTARC_FRAME_TEST: () => window && window.QueryString && window.QueryString.preferences === "0",
+    EVAL_TRUSTARC_FRAME_GTM: () => window && window.QueryString && window.QueryString.gtm === "1",
     // declarative rules
     EVAL_ADROLL_0: () => !document.cookie.includes("__adroll_fpc"),
     EVAL_ALMACMP_0: () => document.cookie.includes('"name":"Google","consent":false'),
@@ -1043,7 +1045,7 @@
       this._optInDone = false;
     }
     get hasSelfTest() {
-      return false;
+      return true;
     }
     get isIntermediate() {
       if (this._optInDone) {
@@ -1090,6 +1092,7 @@
       return true;
     }
     async test() {
+      await this.wait(500);
       return await this.mainWorldEval("EVAL_TRUSTARC_TOP");
     }
   };
@@ -1106,7 +1109,7 @@
       };
     }
     get hasSelfTest() {
-      return false;
+      return true;
     }
     get isIntermediate() {
       return false;
@@ -1142,27 +1145,34 @@
       );
     }
     async optOut() {
+      if (await this.mainWorldEval("EVAL_TRUSTARC_FRAME_TEST")) {
+        return true;
+      }
+      let timeout = 3e3;
+      if (await this.mainWorldEval("EVAL_TRUSTARC_FRAME_GTM")) {
+        timeout = 1500;
+      }
       await waitFor(() => document.readyState === "complete", 20, 100);
-      await this.waitForElement(".mainContent[aria-hidden=false]", 5e3);
+      await this.waitForElement(".mainContent[aria-hidden=false]", timeout);
       if (this.click(".rejectAll")) {
         return true;
       }
       if (this.elementExists(".prefPanel")) {
-        await this.waitForElement('.prefPanel[style="visibility: visible;"]', 3e3);
+        await this.waitForElement('.prefPanel[style="visibility: visible;"]', timeout);
       }
       if (this.click("#catDetails0")) {
         this.click(".submit");
-        this.waitForThenClick("#gwt-debug-close_id", 5e3);
+        this.waitForThenClick("#gwt-debug-close_id", timeout);
         return true;
       }
       if (this.click(".required")) {
-        this.waitForThenClick("#gwt-debug-close_id", 5e3);
+        this.waitForThenClick("#gwt-debug-close_id", timeout);
         return true;
       }
       await this.navigateToSettings();
       this.click(".switch span:nth-child(1):not(.active)", true);
       this.click(".submit");
-      this.waitForThenClick("#gwt-debug-close_id", 3e5);
+      this.waitForThenClick("#gwt-debug-close_id", timeout * 10);
       return true;
     }
     async optIn() {
@@ -1177,6 +1187,10 @@
       });
       return true;
     }
+    async test() {
+      await this.wait(500);
+      return await this.mainWorldEval("EVAL_TRUSTARC_FRAME_TEST");
+    }
   };
 
   // lib/cmps/cookiebot.ts
@@ -5751,7 +5765,7 @@
         urlPattern: "^https://www\\.instagram\\.com/"
       },
       prehideSelectors: [
-        ".x78zum5.xdt5ytf.xg6iff7.x1n2onr6"
+        ".x78zum5.xdt5ytf.xg6iff7.x1n2onr6:has(._a9--)"
       ],
       detectCmp: [
         {

package/lib/cmps/trustarc-frame.ts

@@ -12,7 +12,7 @@ export default class TrustArcFrame extends AutoConsentCMPBase {
   }
 
   get hasSelfTest(): boolean {
-    return false;
+    return true;
   }
 
   get isIntermediate(): boolean {
@@ -66,25 +66,37 @@ export default class TrustArcFrame extends AutoConsentCMPBase {
   }
 
   async optOut() {
+
+    // if the user has already opted out, let's not close the window
+    if (await this.mainWorldEval('EVAL_TRUSTARC_FRAME_TEST')){
+      return true;
+    }
+
+    //When Tags are being controlled through a tag managment system, the window will not call the vendors' opt-out
+    let timeout = 3000;
+    if (await this.mainWorldEval('EVAL_TRUSTARC_FRAME_GTM')) {
+      timeout = 1500;
+    }
+
     await waitFor(() => document.readyState === 'complete', 20, 100);
-    await this.waitForElement(".mainContent[aria-hidden=false]", 5000);
+    await this.waitForElement(".mainContent[aria-hidden=false]", timeout);
 
     if (this.click(".rejectAll")) {
       return true;
     }
 
     if (this.elementExists('.prefPanel')) {
-      await this.waitForElement('.prefPanel[style="visibility: visible;"]', 3000);
+      await this.waitForElement('.prefPanel[style="visibility: visible;"]', timeout);
     }
 
     if (this.click("#catDetails0")) {
       this.click(".submit");
-      this.waitForThenClick("#gwt-debug-close_id", 5000);
+      this.waitForThenClick("#gwt-debug-close_id", timeout);
       return true;
     }
 
     if (this.click(".required")) {
-      this.waitForThenClick("#gwt-debug-close_id", 5000);
+      this.waitForThenClick("#gwt-debug-close_id", timeout);
       return true;
     }
 
@@ -95,7 +107,7 @@ export default class TrustArcFrame extends AutoConsentCMPBase {
     this.click(".submit");
 
     // at this point, iframe usually closes. Sometimes we need to close manually, but we don't wait for it to report success
-    this.waitForThenClick("#gwt-debug-close_id", 300000);
+    this.waitForThenClick("#gwt-debug-close_id", timeout*10);
 
     return true;
   }
@@ -116,4 +128,11 @@ export default class TrustArcFrame extends AutoConsentCMPBase {
 
     return true;
   }
+
+  async test() {
+    //Test JS variable to check the user's preference
+    //preferences = undefined means no consent is set, preferences = '0' means consent is set to required only 
+    await this.wait(500);
+    return await this.mainWorldEval('EVAL_TRUSTARC_FRAME_TEST');
+  }
 }

package/lib/cmps/trustarc-top.ts

@@ -31,7 +31,7 @@ export default class TrustArcTop extends AutoConsentCMPBase {
   }
 
   get hasSelfTest(): boolean {
-    return false;
+    return true;
   }
 
   get isIntermediate(): boolean {
@@ -97,6 +97,7 @@ export default class TrustArcTop extends AutoConsentCMPBase {
   async test() {
     //Test JS variable to check the user's preference
     //PrefCookie = undefined means no consent is set, PrefCookie = '0' means consent is set to required only 
+    await this.wait(500);
     return await this.mainWorldEval('EVAL_TRUSTARC_TOP');
   }
 }

package/lib/eval-snippets.ts

@@ -49,6 +49,8 @@ export const snippets = {
   },
   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',
+  EVAL_TRUSTARC_FRAME_TEST: () => window && window.QueryString && window.QueryString.preferences === '0',
+  EVAL_TRUSTARC_FRAME_GTM: () => window && window.QueryString && window.QueryString.gtm === '1',
 
   // declarative rules
   EVAL_ADROLL_0: () => !document.cookie.includes('__adroll_fpc'),

package/package.json

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

package/rules/autoconsent/instagram.json

@@ -4,7 +4,7 @@
   "runContext": {
     "urlPattern": "^https://www\\.instagram\\.com/"
   },
-  "prehideSelectors": [".x78zum5.xdt5ytf.xg6iff7.x1n2onr6"],
+  "prehideSelectors": [".x78zum5.xdt5ytf.xg6iff7.x1n2onr6:has(._a9--)"],
   "detectCmp": [
     {
       "exists": ".x1qjc9v5.x9f619.x78zum5.xdt5ytf.x1iyjqo2.xl56j7k"

package/rules/rules.json

@@ -3376,7 +3376,7 @@
         "urlPattern": "^https://www\\.instagram\\.com/"
       },
       "prehideSelectors": [
-        ".x78zum5.xdt5ytf.xg6iff7.x1n2onr6"
+        ".x78zum5.xdt5ytf.xg6iff7.x1n2onr6:has(._a9--)"
       ],
       "detectCmp": [
         {