rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Derive consent mode from geolocation, not banner config

Browse Source 
The consent mode is now determined dynamically by the visitor's
country and its applicable regulation. The configured consent_mode
column is dropped from cookie_banners and added to
cookie_consent_records to persist the geo-derived mode at
consent-recording time. When no regulation matches, the default
is OPT_OUT.

Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-05-13 12:17:34 +04:00
parent e9d786c5d6
commit e739473bcd
30 changed files with 68 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
e2e/console/cookie_banner_test.go
View File

@@ -41,7 +41,6 @@ func TestCookieBanner_Create(t *testing.T) {
state
cookiePolicyUrl
consentExpiryDays
consentMode
showBranding
defaultLanguage
createdAt
@@ -65,7 +64,6 @@ func TestCookieBanner_Create(t *testing.T) {
State string `json:"state"`
CookiePolicyUrl string `json:"cookiePolicyUrl"`
ConsentExpiryDays int `json:"consentExpiryDays"`
ConsentMode string `json:"consentMode"`
ShowBranding bool `json:"showBranding"`
DefaultLanguage string `json:"defaultLanguage"`
CreatedAt string `json:"createdAt"`
@@ -82,7 +80,6 @@ func TestCookieBanner_Create(t *testing.T) {
"origin": origin,
"cookiePolicyUrl": "https://example.com/cookies",
"consentExpiryDays": 365,
"consentMode": "OPT_IN",
},
}, &result)
@@ -93,7 +90,6 @@ func TestCookieBanner_Create(t *testing.T) {
assert.Equal(t, "ACTIVE", node.State)
assert.Equal(t, "https://example.com/cookies", node.CookiePolicyUrl)
assert.Equal(t, 365, node.ConsentExpiryDays)
assert.Equal(t, "OPT_IN", node.ConsentMode)
assert.Equal(t, "en", node.DefaultLanguage)
assert.NotEmpty(t, node.CreatedAt)
assert.NotEmpty(t, node.UpdatedAt)
@@ -110,7 +106,6 @@ func TestCookieBanner_Create(t *testing.T) {
node {
id
privacyPolicyUrl
consentMode
}
}
}
@@ -123,7 +118,6 @@ func TestCookieBanner_Create(t *testing.T) {
Node struct {
ID string `json:"id"`
PrivacyPolicyUrl *string `json:"privacyPolicyUrl"`
ConsentMode string `json:"consentMode"`
} `json:"node"`
} `json:"cookieBannerEdge"`
} `json:"createCookieBanner"`
@@ -137,7 +131,6 @@ func TestCookieBanner_Create(t *testing.T) {
"cookiePolicyUrl": "https://example.com/cookies",
"privacyPolicyUrl": "https://example.com/privacy",
"consentExpiryDays": 180,
"consentMode": "OPT_OUT",
},
}, &result)
@@ -146,7 +139,6 @@ func TestCookieBanner_Create(t *testing.T) {
assert.NotEmpty(t, node.ID)
require.NotNil(t, node.PrivacyPolicyUrl)
assert.Equal(t, "https://example.com/privacy", *node.PrivacyPolicyUrl)
assert.Equal(t, "OPT_OUT", node.ConsentMode)
})
t.Run("creates default categories", func(t *testing.T) {
@@ -220,7 +212,6 @@ func TestCookieBanner_Create(t *testing.T) {
"origin": origin,
"cookiePolicyUrl": "https://example.com/cookies",
"consentExpiryDays": 365,
"consentMode": "OPT_IN",
},
})
require.Error(t, err)
@@ -243,7 +234,6 @@ func TestCookieBanner_Create(t *testing.T) {
"origin": factory.SafeOrigin(),
"cookiePolicyUrl": "https://example.com/cookies",
"consentExpiryDays": 365,
"consentMode": "OPT_IN",
},
})
require.Error(t, err)
@@ -306,7 +296,6 @@ func TestCookieBanner_Update(t *testing.T) {
updateCookieBanner(input: $input) {
cookieBanner {
consentExpiryDays
consentMode
defaultLanguage
}
}
@@ -317,7 +306,6 @@ func TestCookieBanner_Update(t *testing.T) {
UpdateCookieBanner struct {
CookieBanner struct {
ConsentExpiryDays int `json:"consentExpiryDays"`
ConsentMode string `json:"consentMode"`
DefaultLanguage string `json:"defaultLanguage"`
} `json:"cookieBanner"`
} `json:"updateCookieBanner"`
@@ -327,14 +315,12 @@ func TestCookieBanner_Update(t *testing.T) {
"input": map[string]any{
"cookieBannerId": bannerID,
"consentExpiryDays": 90,
"consentMode": "OPT_OUT",
"defaultLanguage": "fr",
},
}, &result)
require.NoError(t, err)
assert.Equal(t, 90, result.UpdateCookieBanner.CookieBanner.ConsentExpiryDays)
assert.Equal(t, "OPT_OUT", result.UpdateCookieBanner.CookieBanner.ConsentMode)
assert.Equal(t, "fr", result.UpdateCookieBanner.CookieBanner.DefaultLanguage)
})
}
@@ -574,7 +560,6 @@ func TestCookieBanner_Node(t *testing.T) {
name
origin
state
consentMode
}
}
}
@@ -582,11 +567,10 @@ func TestCookieBanner_Node(t *testing.T) {
var result struct {
Node struct {
ID string `json:"id"`
Name string `json:"name"`
Origin string `json:"origin"`
State string `json:"state"`
ConsentMode string `json:"consentMode"`
ID string `json:"id"`
Name string `json:"name"`
Origin string `json:"origin"`
State string `json:"state"`
} `json:"node"`
}
@@ -842,7 +826,6 @@ func TestCookieBanner_RBAC(t *testing.T) {
"origin": factory.SafeOrigin(),
"cookiePolicyUrl": "https://example.com/cookies",
"consentExpiryDays": 365,
"consentMode": "OPT_IN",
},
})
testutil.RequireForbiddenError(t, err, "viewer should not be able to create cookie banner")

2
e2e/console/cookie_banner_versioning_test.go
View File

@@ -153,7 +153,6 @@ func TestCookieBannerVersioning_NoOpUpdates(t *testing.T) {
bannerID := factory.CreateCookieBanner(owner, factory.Attrs{
"cookiePolicyUrl": "https://example.com/cookies",
"consentExpiryDays": 365,
"consentMode": "OPT_IN",
})
published := publishBanner(t, owner, bannerID)
@@ -172,7 +171,6 @@ func TestCookieBannerVersioning_NoOpUpdates(t *testing.T) {
"cookieBannerId": bannerID,
"cookiePolicyUrl": "https://example.com/cookies",
"consentExpiryDays": 365,
"consentMode": "OPT_IN",
},
}, &result)
require.NoError(t, err)

6
e2e/internal/factory/factory.go
View File

@@ -1239,7 +1239,6 @@ func CreateCookieBanner(c *testutil.Client, attrs ...Attrs) string {
"origin": a.getString("origin", SafeOrigin()),
"cookiePolicyUrl": a.getString("cookiePolicyUrl", "https://example.com/cookies"),
"consentExpiryDays": a.getInt("consentExpiryDays", 365),
"consentMode": a.getString("consentMode", "OPT_IN"),
}
if ppURL := a.getStringPtr("privacyPolicyUrl"); ppURL != nil {
input["privacyPolicyUrl"] = *ppURL
@@ -1295,11 +1294,6 @@ func (b *CookieBannerBuilder) WithConsentExpiryDays(days int) *CookieBannerBuild
return b
}
func (b *CookieBannerBuilder) WithConsentMode(mode string) *CookieBannerBuilder {
b.attrs["consentMode"] = mode
return b
}
func (b *CookieBannerBuilder) Create() string {
return CreateCookieBanner(b.client, b.attrs)
}