upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Remove duplicate SAML login error message (#29767)

Browse source
This commit is contained in:
Ben Schumacher 2025-01-09 12:41:11 +01:00 committed by GitHub
parent db3b72e46c
commit e8beefd423
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/channels/api4/limits.go
View file

@ -29,6 +29,6 @@ func getServerLimits(c *Context, w http.ResponseWriter, r *http.Request) {
}
if err := json.NewEncoder(w).Encode(serverLimits); err != nil {
c.Logger.Error("Error writing server limits response", mlog.Err(err))
c.Logger.Warn("Error writing server limits response", mlog.Err(err))
}
}

2
server/channels/web/handlers.go
View file

@ -450,7 +450,7 @@ func (h Handler) handleContextError(c *Context, w http.ResponseWriter, r *http.R
w.Header().Set("Content-Type", "application/json")
w.WriteHeader(c.Err.StatusCode)
if _, err := w.Write([]byte(c.Err.ToJSON())); err != nil {
c.Logger.Error("Failed to write error response", mlog.Err(err))
c.Logger.Warn("Failed to write error response", mlog.Err(err))
}
} else {
utils.RenderWebAppError(c.App.Config(), w, r, c.Err, c.App.AsymmetricSigningKey())

2
server/channels/web/oauth.go
View file

@ -80,7 +80,7 @@ func authorizeOAuthApp(c *Context, w http.ResponseWriter, r *http.Request) {
_, err = w.Write([]byte(model.MapToJSON(map[string]string{"redirect": redirectURL})))
if err != nil {
c.Logger.Error("Error writing response", mlog.Err(err))
c.Logger.Warn("Error writing response", mlog.Err(err))
}
}

3
server/channels/web/saml.go
View file

@ -12,7 +12,6 @@ import (
"time"
"github.com/mattermost/mattermost/server/public/model"
"github.com/mattermost/mattermost/server/public/shared/mlog"
"github.com/mattermost/mattermost/server/v8/channels/audit"
"github.com/mattermost/mattermost/server/v8/channels/utils"
)
@ -128,8 +127,6 @@ func completeSaml(c *Context, w http.ResponseWriter, r *http.Request) {
c.Err = err
c.Err.StatusCode = http.StatusFound
}
c.Logger.Error("Failed to complete SAML login", mlog.Err(err))
}
if len(encodedXML) > maxSAMLResponseSize {