Unset default tags until a choice has been made

cypress/e2e/cookie_consent.js

@@ -44,7 +44,7 @@ describe("Cookie consent", () => {
     cy.getCookie("wtm").should(
       "have.property",
       "value",
-      "necessary:true|preferences:unset|statistics:pending|marketing:false"
+      "necessary:unset|preferences:unset|statistics:pending|marketing:unset"
     );
   });
 

cypress/e2e/sandbox.js

@@ -5,7 +5,7 @@ describe("The website", () => {
     cy.getCookie("wtm").should(
       "have.property",
       "value",
-      "necessary:true|preferences:unset|statistics:pending|marketing:false"
+      "necessary:unset|preferences:unset|statistics:pending|marketing:unset"
     );
 
     cy.get("body")

cypress/e2e/tags.js

@@ -23,7 +23,7 @@ describe("Necessary tags", () => {
     cy.getCookie("wtm").should(
       "have.property",
       "value",
-      "necessary:true|preferences:unset|statistics:pending|marketing:false"
+      "necessary:unset|preferences:unset|statistics:pending|marketing:unset"
     );
 
     cy.setCookie("wtm", "necessary:false|preferences:false|statistics:false|marketing:false");
@@ -37,7 +37,7 @@ describe("Necessary tags", () => {
     cy.getCookie("wtm").should(
       "have.property",
       "value",
-      "necessary:true|preferences:false|statistics:false|marketing:false"
+      "necessary:unset|preferences:false|statistics:false|marketing:false"
     );
 
     cy.setCookie("wtm", "necessary:unset|preferences:false|statistics:false|marketing:false");
@@ -51,7 +51,7 @@ describe("Necessary tags", () => {
     cy.getCookie("wtm").should(
       "have.property",
       "value",
-      "necessary:true|preferences:false|statistics:false|marketing:false"
+      "necessary:unset|preferences:false|statistics:false|marketing:false"
     );
   });
 
@@ -183,7 +183,7 @@ describe("Marketing tags", () => {
     cy.getCookie("wtm").should(
       "have.property",
       "value",
-      "necessary:true|preferences:false|statistics:false|marketing:false"
+      "necessary:true|preferences:false|statistics:false|marketing:unset"
     );
   });
 

src/wagtail_tag_manager/forms.py

@@ -14,7 +14,7 @@ def __init__(self, *args, **kwargs):
             value = config.get("value")
             initial = value == SETTING_INITIAL or value == SETTING_REQUIRED
 
-            if SETTING_INITIAL in kwargs:
+            if "initial" in kwargs:
                 initial = kwargs.get(SETTING_INITIAL)[tag_type]
 
             self.fields[tag_type] = forms.BooleanField(

src/wagtail_tag_manager/strategy.py

@@ -1,6 +1,6 @@
 from django.http import Http404
-from django.db.models import Q
 from wagtail.views import serve as wagtail_serve
+from django.db.models import Q
 
 from wagtail_tag_manager.mixins import TagMixin
 from wagtail_tag_manager.models import Tag, Trigger, TagTypeSettings
@@ -23,6 +23,7 @@
         SETTING_REQUIRED,
         (
             # Consent validator, consent value, include instant tags, include lazy tags
+            (lambda c: c != CONSENT_TRUE, CONSENT_UNSET, True, False),
             (lambda c: True, CONSENT_TRUE, True, False),
         ),
     ),
@@ -47,11 +48,18 @@
         "GET",
         SETTING_DEFAULT,
         (
+            (lambda c: c == CONSENT_UNSET, CONSENT_UNSET, False, False),
             (lambda c: c == CONSENT_TRUE, CONSENT_TRUE, True, False),
-            (lambda c: c != CONSENT_TRUE, CONSENT_FALSE, False, False),
         ),
     ),
-    ("POST", SETTING_REQUIRED, ((lambda c: True, CONSENT_TRUE, False, True),)),
+    (
+        "POST",
+        SETTING_REQUIRED,
+        (
+            (lambda c: c != CONSENT_TRUE, CONSENT_UNSET, False, True),
+            (lambda c: True, CONSENT_TRUE, False, True),
+        ),
+    ),
     (
         "POST",
         SETTING_INITIAL,
@@ -73,8 +81,8 @@
         "POST",
         SETTING_DEFAULT,
         (
+            (lambda c: c == CONSENT_UNSET, CONSENT_UNSET, False, False),
             (lambda c: c == CONSENT_TRUE, CONSENT_TRUE, False, True),
-            (lambda c: c != CONSENT_TRUE, CONSENT_FALSE, False, False),
         ),
     ),
 )
@@ -249,10 +257,27 @@ def _get_tags_for_trigger(self):
 
     @property
     def cookie_state(self):
-        return {
-            tag_type: self.consent.get(tag_type, CONSENT_FALSE) != CONSENT_FALSE
-            for tag_type in Tag.get_types()
-        }
+        """
+        Returns the consent state mapped to simple True and False booleans
+        instead of the in-between consent states that might exist.
+        """
+
+        cookie_state = {}
+
+        for tag_type, config in TagTypeSettings.all().items():
+            state = self.consent.get(tag_type, CONSENT_FALSE)
+            setting = config.get("value", SETTING_DEFAULT)
+
+            if setting == SETTING_REQUIRED:
+                cookie_state[tag_type] = True
+            elif setting == SETTING_DEFAULT:
+                cookie_state[tag_type] = self.consent.get(
+                    tag_type, CONSENT_UNSET
+                ) not in (CONSENT_FALSE, CONSENT_UNSET)
+            else:
+                cookie_state[tag_type] = state != CONSENT_FALSE
+
+        return cookie_state
 
     @property
     def is_debug(self):

tests/unit/test_endpoints.py

@@ -48,10 +48,10 @@ def test_lazy_cookies(client, site):
 
     assert "wtm" in response.cookies
     consent_state = get_consent(response)
-    assert consent_state.get("necessary", "") == "true"
+    assert consent_state.get("necessary", "") == "unset"
     assert consent_state.get("preferences", "") == "unset"
     assert consent_state.get("statistics", "") == "unset"
-    assert consent_state.get("marketing", "") == "false"
+    assert consent_state.get("marketing", "") == "unset"
 
 
 @pytest.mark.django_db
@@ -69,7 +69,7 @@ def test_required_lazy_cookies(client, site):
 
     assert "wtm" in response.cookies
     consent_state = get_consent(response)
-    assert consent_state.get("necessary", "") == "true"
+    assert consent_state.get("necessary", "") == "unset"
 
 
 @pytest.mark.django_db