From be652dd283d8c42adddedc66d6ba9210d5bdb511 Mon Sep 17 00:00:00 2001 From: mo khan Date: Thu, 1 May 2025 16:04:48 -0600 Subject: refactor: extract helper to log errors consistently --- app/middleware/id_token.go | 3 ++- app/middleware/is_logged_in.go | 2 +- app/middleware/token_parser.go | 4 ++-- app/middleware/user.go | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'app/middleware') diff --git a/app/middleware/id_token.go b/app/middleware/id_token.go index bb874e2..5a44f49 100644 --- a/app/middleware/id_token.go +++ b/app/middleware/id_token.go @@ -7,6 +7,7 @@ import ( "github.com/xlgmokha/x/pkg/x" xcfg "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/cfg" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc" + "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/pls" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/web" ) @@ -19,7 +20,7 @@ func IDToken(cfg *oidc.OpenID, parsers ...TokenParser) func(http.Handler) http.H idToken, err := cfg.ValidateIDToken(r.Context(), rawIDToken) if err != nil { - log.WithFields(r.Context(), log.Fields{"error": err}) + pls.LogError(r.Context(), err) web.ExpireCookie(w, "session") } else { log.WithFields(r.Context(), log.Fields{"id_token": idToken}) diff --git a/app/middleware/is_logged_in.go b/app/middleware/is_logged_in.go index 92b9c8b..e2f0445 100644 --- a/app/middleware/is_logged_in.go +++ b/app/middleware/is_logged_in.go @@ -8,5 +8,5 @@ import ( ) var IsLoggedIn x.Predicate[*http.Request] = x.Predicate[*http.Request](func(r *http.Request) bool { - return !x.IsZero(cfg.CurrentUser.From(r.Context())) + return x.IsPresent(cfg.CurrentUser.From(r.Context())) }) diff --git a/app/middleware/token_parser.go b/app/middleware/token_parser.go index a719b2f..8d81aab 100644 --- a/app/middleware/token_parser.go +++ b/app/middleware/token_parser.go @@ -3,8 +3,8 @@ package middleware import ( "net/http" - "github.com/xlgmokha/x/pkg/log" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc" + "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/pls" ) type TokenParser func(*http.Request) oidc.RawToken @@ -18,7 +18,7 @@ func IDTokenFromSessionCookie(r *http.Request) oidc.RawToken { tokens, err := oidc.TokensFromBase64String(cookies[0].Value) if err != nil { - log.WithFields(r.Context(), log.Fields{"error": err}) + pls.LogError(r.Context(), err) return "" } diff --git a/app/middleware/user.go b/app/middleware/user.go index 21455ba..03c04d6 100644 --- a/app/middleware/user.go +++ b/app/middleware/user.go @@ -3,12 +3,12 @@ package middleware import ( "net/http" - "github.com/xlgmokha/x/pkg/log" "github.com/xlgmokha/x/pkg/mapper" "github.com/xlgmokha/x/pkg/x" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/cfg" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/domain" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/oidc" + "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/pls" ) func User(db domain.Repository[*domain.User]) func(http.Handler) http.Handler { @@ -24,7 +24,7 @@ func User(db domain.Repository[*domain.User]) func(http.Handler) http.Handler { if !x.IsPresent(user) { user = mapper.MapFrom[*oidc.IDToken, *domain.User](idToken) if err := db.Save(user); err != nil { - log.WithFields(r.Context(), log.Fields{"error": err}) + pls.LogError(r.Context(), err) next.ServeHTTP(w, r) return } -- cgit v1.2.3