diff --git a/pkg/gordio/auth/jwt.go b/pkg/gordio/auth/jwt.go index 4ebc5b6..508fbcd 100644 --- a/pkg/gordio/auth/jwt.go +++ b/pkg/gordio/auth/jwt.go @@ -137,7 +137,7 @@ func (a *authenticator) routeRefresh(w http.ResponseWriter, r *http.Request) { if a.allowInsecureCookie(r) { cookie.Secure = false - cookie.SameSite = http.SameSiteNoneMode + cookie.SameSite = http.SameSiteLaxMode log.Debug().Msg("same site none") } @@ -181,7 +181,7 @@ func (a *authenticator) routeAuth(w http.ResponseWriter, r *http.Request) { if a.allowInsecureCookie(r) { cookie.Secure = false - cookie.SameSite = http.SameSiteNoneMode + cookie.SameSite = http.SameSiteLaxMode } else { cookie.Domain = a.cfg.Domain } diff --git a/sql/postgres/migrations/001_initial.up.sql b/sql/postgres/migrations/001_initial.up.sql index 4224da9..16175ab 100644 --- a/sql/postgres/migrations/001_initial.up.sql +++ b/sql/postgres/migrations/001_initial.up.sql @@ -76,7 +76,7 @@ BEGIN IF NOT EXISTS ( SELECT tg.system_id, tg.tgid, tg.name, tg.alpha_tag FROM talkgroups tg WHERE tg.system_id = NEW.system AND tg.tgid = NEW.talkgroup UNION - SELECT tgl.system_id, tgl.tgid, tgl.name, tg.alpha_tag FROM talkgroups_learned tgl WHERE tgl.system_id = NEW.system AND tgl.tgid = NEW.talkgroup + SELECT tgl.system_id, tgl.tgid, tgl.name, tgl.alpha_tag FROM talkgroups_learned tgl WHERE tgl.system_id = NEW.system AND tgl.tgid = NEW.talkgroup ) THEN INSERT INTO talkgroups_learned(system_id, tgid, name, alpha_tag) VALUES( NEW.system, NEW.talkgroup, NEW.tg_label, NEW.alpha_tag