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

Link detected cookies to existing patterns on conflict

Browse Source 
When a cookie pattern already exists for a banner, the insert
conflict caused a continue that silently dropped the detected
cookie instead of linking it to the existing pattern. Load the
existing pattern to obtain its ID and proceed with cookie
insertion.

Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-04-30 11:45:02 +04:00
parent 426066e078
commit 33abbfbb8f
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/helpers/src/duration.ts
View File

@@ -43,8 +43,10 @@ export function humanizeSeconds(seconds: number | null): string {
} }
export function toMaxAgeSeconds(value: string, unit: string): number | null { export function toMaxAgeSeconds(value: string, unit: string): number | null {
const num = parseFloat(value); const trimmed = value.trim();
if (isNaN(num) || num <= 0) return null; if (trimmed === "" || !/^\d+(\.\d+)?$/.test(trimmed)) return null;
const num = Number(trimmed);
if (!Number.isFinite(num) || num <= 0) return null;
const u = DURATION_UNITS.find(u => u.value === unit); const u = DURATION_UNITS.find(u => u.value === unit);
if (!u) return null; if (!u) return null;
const rounded = Math.round(num * u.seconds); const rounded = Math.round(num * u.seconds);

6
pkg/cookiebanner/errors.go
View File

@@ -29,9 +29,9 @@ var (
ErrCategorySlugAlreadyExists = errors.New("a category with this slug already exists in this banner") ErrCategorySlugAlreadyExists = errors.New("a category with this slug already exists in this banner")
ErrOriginAlreadyInUse = errors.New("origin is already used by another active cookie banner") ErrOriginAlreadyInUse = errors.New("origin is already used by another active cookie banner")
ErrConsentNotFound = errors.New("consent record not found") ErrConsentNotFound = errors.New("consent record not found")
ErrCookieNotFound = errors.New("cookie not found") ErrCookieNotFound = errors.New("cookie not found")
ErrCategoriesBannerMismatch = errors.New("source and target categories belong to different banners") ErrCategoriesBannerMismatch = errors.New("source and target categories belong to different banners")
ErrPostHogConsentKindInvalid = errors.New("PostHog consent can only be enabled on normal categories") ErrPostHogConsentKindInvalid = errors.New("PostHog consent can only be enabled on normal categories")
ErrCookiePatternNotFound = errors.New("cookie pattern not found") ErrCookiePatternNotFound = errors.New("cookie pattern not found")
ErrPatternAlreadyExists = errors.New("a pattern with this name already exists in this banner") ErrPatternAlreadyExists = errors.New("a pattern with this name already exists in this banner")
ErrSamePatternCategoryMove = errors.New("source and target cookie categories must be different") ErrSamePatternCategoryMove = errors.New("source and target cookie categories must be different")

13
pkg/cookiebanner/service.go
View File

@@ -2286,11 +2286,16 @@ func (s *Service) ReportDetectedCookies(
if err != nil { if err != nil {
return fmt.Errorf("cannot insert cookie pattern: %w", err) return fmt.Errorf("cannot insert cookie pattern: %w", err)
} }
if !wasInserted { if wasInserted {
continue patternID = newPattern.ID
inserted++
} else {
var existingPattern coredata.CookiePattern
if err := existingPattern.LoadByBannerIDAndPattern(ctx, tx, scope, banner.ID, dc.Name); err != nil {
return fmt.Errorf("cannot load existing cookie pattern: %w", err)
}
patternID = existingPattern.ID
} }
patternID = newPattern.ID
inserted++
} }
cookie := &coredata.Cookie{ cookie := &coredata.Cookie{