github-starred/vikunja
2
0
Fork 0
mirror of https://github.com/go-vikunja/vikunja.git synced 2026-04-29 19:10:51 -05:00
Code Issues 690 Packages Projects Releases 11 Wiki Activity

fix(deps): update module github.com/labstack/echo/v4 to v5 (#2131)

Browse Source 
Closes https://github.com/go-vikunja/vikunja/pull/2133

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: kolaente <k@knt.li>
This commit is contained in:
renovate[bot]
2026-01-24 20:38:32 +01:00
committed by GitHub
parent 83474b76d3
commit 9a61453e86
63 changed files with 667 additions and 617 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/user/user.go
View File

@@ -33,7 +33,7 @@ import (
"code.vikunja.io/api/pkg/web"
"github.com/golang-jwt/jwt/v5"
"github.com/labstack/echo/v4"
"github.com/labstack/echo/v5"
"golang.org/x/crypto/bcrypt"
"xorm.io/builder"
"xorm.io/xorm"
@@ -425,7 +425,7 @@ func CheckUserPassword(user *User, password string) error {
}
// GetCurrentUserFromDB gets a user from jwt claims and returns the full user from the db.
func GetCurrentUserFromDB(s *xorm.Session, c echo.Context) (user *User, err error) {
func GetCurrentUserFromDB(s *xorm.Session, c *echo.Context) (user *User, err error) {
u, err := GetCurrentUser(c)
if err != nil {
return nil, err
@@ -435,7 +435,7 @@ func GetCurrentUserFromDB(s *xorm.Session, c echo.Context) (user *User, err erro
}
// GetCurrentUser returns the current user based on its jwt token
func GetCurrentUser(c echo.Context) (user *User, err error) {
func GetCurrentUser(c *echo.Context) (user *User, err error) {
if apiUser, ok := c.Get("api_user").(*User); ok {
return apiUser, nil
}