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

Review fixes

Browse Source 
Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-04-14 13:16:24 +04:00
parent ced9ba3550
commit c8586346be
2 changed files with 51 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/coredata/cookie_banner.go
View File

@@ -168,6 +168,7 @@ LIMIT 1;
func (b *CookieBanner) LoadActiveByOrigin( func (b *CookieBanner) LoadActiveByOrigin(
ctx context.Context, ctx context.Context,
conn pg.Querier, conn pg.Querier,
scope Scoper,
origin string, origin string,
) error { ) error {
q := ` q := `
@@ -185,12 +186,16 @@ SELECT
FROM FROM
cookie_banners cookie_banners
WHERE WHERE
origin = @origin %s
AND origin = @origin
AND state = 'ACTIVE' AND state = 'ACTIVE'
LIMIT 1; LIMIT 1;
` `
q = fmt.Sprintf(q, scope.SQLFragment())
args := pgx.StrictNamedArgs{"origin": origin} args := pgx.StrictNamedArgs{"origin": origin}
maps.Copy(args, scope.SQLArguments())
rows, err := conn.Query(ctx, q, args) rows, err := conn.Query(ctx, q, args)
if err != nil { if err != nil {
@@ -345,8 +350,7 @@ INSERT INTO cookie_banners (
_, err := tx.Exec(ctx, q, args) _, err := tx.Exec(ctx, q, args)
if err != nil { if err != nil {
var pgErr *pgconn.PgError if pgErr, ok := errors.AsType[*pgconn.PgError](err); ok {
if errors.As(err, &pgErr) {
if pgErr.Code == "23505" && pgErr.ConstraintName == "idx_cookie_banners_unique_active_origin" { if pgErr.Code == "23505" && pgErr.ConstraintName == "idx_cookie_banners_unique_active_origin" {
return ErrResourceAlreadyExists return ErrResourceAlreadyExists
} }
@@ -393,8 +397,7 @@ WHERE
result, err := tx.Exec(ctx, q, args) result, err := tx.Exec(ctx, q, args)
if err != nil { if err != nil {
var pgErr *pgconn.PgError if pgErr, ok := errors.AsType[*pgconn.PgError](err); ok {
if errors.As(err, &pgErr) {
if pgErr.Code == "23505" && pgErr.ConstraintName == "idx_cookie_banners_unique_active_origin" { if pgErr.Code == "23505" && pgErr.ConstraintName == "idx_cookie_banners_unique_active_origin" {
return ErrResourceAlreadyExists return ErrResourceAlreadyExists
} }

6
pkg/server/api/cookiebanner/v1/cors_middleware.go
View File

@@ -26,7 +26,8 @@ import (
func newCORSMiddleware(logger *log.Logger, cookieBannerSvc *cookiebanner.Service) func(http.Handler) http.Handler { func newCORSMiddleware(logger *log.Logger, cookieBannerSvc *cookiebanner.Service) func(http.Handler) http.Handler {
return func(next http.Handler) http.Handler { return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(
func(w http.ResponseWriter, r *http.Request) {
origin := r.Header.Get("Origin") origin := r.Header.Get("Origin")
if origin == "" { if origin == "" {
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
@@ -74,6 +75,7 @@ func newCORSMiddleware(logger *log.Logger, cookieBannerSvc *cookiebanner.Service
} }
next.ServeHTTP(w, r) next.ServeHTTP(w, r)
}) },
)
} }
} }