diff options
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/dashboard/controller.go | 6 | ||||
| -rw-r--r-- | app/controllers/sessions/controller.go | 6 | ||||
| -rw-r--r-- | app/controllers/sparkles/controller.go | 9 | ||||
| -rw-r--r-- | app/controllers/sparkles/init.go | 4 |
4 files changed, 13 insertions, 12 deletions
diff --git a/app/controllers/dashboard/controller.go b/app/controllers/dashboard/controller.go index 0f165ad..097834f 100644 --- a/app/controllers/dashboard/controller.go +++ b/app/controllers/dashboard/controller.go @@ -3,10 +3,10 @@ package dashboard import ( "net/http" - "github.com/xlgmokha/x/pkg/log" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/cfg" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/middleware" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/views" + "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/pls" ) type Controller struct { @@ -31,7 +31,7 @@ func (c *Controller) Show(w http.ResponseWriter, r *http.Request) { dto := &ViewDashboardDTO{CurrentUser: currentUser} if err := views.Render(w, "dashboard/show", dto); err != nil { - log.WithFields(r.Context(), log.Fields{"error": err}) + pls.LogError(r.Context(), err) w.WriteHeader(http.StatusInternalServerError) return } @@ -48,7 +48,7 @@ func (c *Controller) Navigation(w http.ResponseWriter, r *http.Request) { IsLoggedIn: currentUser != nil, } if err := views.Render(w, "dashboard/nav", dto); err != nil { - log.WithFields(r.Context(), log.Fields{"error": err}) + pls.LogError(r.Context(), err) w.WriteHeader(http.StatusInternalServerError) return } diff --git a/app/controllers/sessions/controller.go b/app/controllers/sessions/controller.go index 3fb29ec..77a30fd 100644 --- a/app/controllers/sessions/controller.go +++ b/app/controllers/sessions/controller.go @@ -5,9 +5,9 @@ import ( "time" "github.com/xlgmokha/x/pkg/cookie" - "github.com/xlgmokha/x/pkg/log" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/middleware" "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" ) @@ -127,14 +127,14 @@ The `id_token` is a JWT that looks like the following body when it is decoded: func (c *Controller) Create(w http.ResponseWriter, r *http.Request) { tokens, err := c.svc.Exchange(r) if err != nil { - log.WithFields(r.Context(), log.Fields{"error": err}) + pls.LogError(r.Context(), err) w.WriteHeader(http.StatusBadRequest) return } encoded, err := tokens.ToBase64String() if err != nil { - log.WithFields(r.Context(), log.Fields{"error": err}) + pls.LogError(r.Context(), err) w.WriteHeader(http.StatusBadRequest) return } diff --git a/app/controllers/sparkles/controller.go b/app/controllers/sparkles/controller.go index dbb5f55..4963950 100644 --- a/app/controllers/sparkles/controller.go +++ b/app/controllers/sparkles/controller.go @@ -9,6 +9,7 @@ import ( "github.com/xlgmokha/x/pkg/x" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/domain" "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/app/middleware" + "gitlab.com/gitlab-org/software-supply-chain-security/authorization/sparkled/pkg/pls" ) type Controller struct { @@ -31,7 +32,7 @@ func (c *Controller) MountTo(mux *http.ServeMux) { func (c *Controller) Index(w http.ResponseWriter, r *http.Request) { if err := serde.ToHTTP(w, r, c.db.All()); err != nil { - log.WithFields(r.Context(), log.Fields{"error": err}) + pls.LogError(r.Context(), err) w.WriteHeader(http.StatusInternalServerError) } } @@ -45,14 +46,14 @@ func (c *Controller) Create(w http.ResponseWriter, r *http.Request) { } if err := c.db.Save(sparkle); err != nil { - log.WithFields(r.Context(), log.Fields{"error": err}) + pls.LogError(r.Context(), err) w.WriteHeader(http.StatusBadRequest) return } w.WriteHeader(http.StatusCreated) if err := serde.ToHTTP(w, r, sparkle); err != nil { - log.WithFields(r.Context(), log.Fields{"error": err}) + pls.LogError(r.Context(), err) w.WriteHeader(http.StatusInternalServerError) return } @@ -66,7 +67,7 @@ func (c *Controller) Restore(w http.ResponseWriter, r *http.Request) { x.Each(sparkles, func(sparkle *domain.Sparkle) { if err := c.db.Save(sparkle); err != nil { - log.WithFields(r.Context(), log.Fields{"error": err}) + pls.LogError(r.Context(), err) } }) } diff --git a/app/controllers/sparkles/init.go b/app/controllers/sparkles/init.go index 1118a09..c85a49d 100644 --- a/app/controllers/sparkles/init.go +++ b/app/controllers/sparkles/init.go @@ -3,18 +3,18 @@ package sparkles import ( "net/http" - "github.com/xlgmokha/x/pkg/log" "github.com/xlgmokha/x/pkg/mapper" "github.com/xlgmokha/x/pkg/serde" "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/pls" ) func init() { mapper.Register[*http.Request, *domain.Sparkle](func(r *http.Request) *domain.Sparkle { sparkle, err := serde.FromHTTP[*domain.Sparkle](r) if err != nil { - log.WithFields(r.Context(), log.Fields{"error": err}) + pls.LogError(r.Context(), err) } sparkle.Author = cfg.CurrentUser.From(r.Context()) return sparkle |
