ami/tl-vikunja
1
0
Fork 0
Code

feat(api tokens): better error message for invalid tokens

Browse Source
This commit is contained in:
kolaente 2023-09-01 10:27:56 +02:00
parent e295d75e6e
commit 8f3d18a809
No known key found for this signature in database
GPG Key ID: F40E70337AB24C9B
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/routes/api_tokens.go
View File

@ -23,7 +23,6 @@ import (
"code.vikunja.io/api/pkg/config" "code.vikunja.io/api/pkg/config"
"code.vikunja.io/api/pkg/db" "code.vikunja.io/api/pkg/db"
"code.vikunja.io/api/pkg/log"
"code.vikunja.io/api/pkg/models" "code.vikunja.io/api/pkg/models"
echojwt "github.com/labstack/echo-jwt/v4" echojwt "github.com/labstack/echo-jwt/v4"
@ -43,7 +42,6 @@ func SetupTokenMiddleware() echo.MiddlewareFunc {
if strings.HasPrefix(s, "Bearer "+models.APITokenPrefix) { if strings.HasPrefix(s, "Bearer "+models.APITokenPrefix) {
err := checkAPITokenAndPutItInContext(s, c) err := checkAPITokenAndPutItInContext(s, c)
if err != nil { if err != nil {
log.Errorf("Could not check api token: %v", err)
return false return false
} }
return true return true
@ -52,6 +50,13 @@ func SetupTokenMiddleware() echo.MiddlewareFunc {
return false return false
}, },
ErrorHandler: func(c echo.Context, err error) error {
if err != nil {
return echo.NewHTTPError(http.StatusUnauthorized, "missing, malformed, expired or otherwise invalid token provided").SetInternal(err)
}
return nil
},
}) })
} }