kodev-org
/
vikunja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(user): handle status errors across the codebase, remove redundant checks

This commit is contained in:
kolaente 2026-03-23 12:24:12 +01:00 committed by kolaente
parent 91c0f386c6
commit ea4ba18def
8 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cmd/user.go
View File

@ -118,7 +118,7 @@ func getUserFromArg(s *xorm.Session, arg string) *user.User {
}
u, err := user.GetUserWithEmail(s, &filter)
if err != nil {
if err != nil && !user.IsErrAccountDisabled(err) && !user.IsErrAccountLocked(err) {
log.Fatalf("Could not get user: %s", err)
}
return u
@ -143,7 +143,7 @@ var userListCmd = &cobra.Command{
if userFlagEmail != "" {
u, err := user.GetUserWithEmail(s, &user.User{Email: userFlagEmail})
if err != nil {
if err != nil && !user.IsErrAccountDisabled(err) && !user.IsErrAccountLocked(err) {
if user.IsErrUserDoesNotExist(err) {
log.Fatalf("No user found with email %s", userFlagEmail)
}

4
pkg/models/project_users.go
View File

@ -142,7 +142,7 @@ func (lu *ProjectUser) Delete(s *xorm.Session, _ web.Auth) (err error) {
// Check if the user exists
u, err := user.GetUserByUsername(s, lu.Username)
if err != nil {
if err != nil && !user.IsErrAccountDisabled(err) && !user.IsErrAccountLocked(err) {
return
}
lu.UserID = u.ID
@ -249,7 +249,7 @@ func (lu *ProjectUser) Update(s *xorm.Session, _ web.Auth) (err error) {
// Check if the user exists
u, err := user.GetUserByUsername(s, lu.Username)
if err != nil {
if err != nil && !user.IsErrAccountDisabled(err) && !user.IsErrAccountLocked(err) {
return err
}
lu.UserID = u.ID

4
pkg/models/team_members.go
View File

@ -110,7 +110,7 @@ func (tm *TeamMember) Delete(s *xorm.Session, a web.Auth) (err error) {
// Find the numeric user id
user, err := user2.GetUserByUsername(s, tm.Username)
if err != nil {
if err != nil && !user2.IsErrAccountDisabled(err) && !user2.IsErrAccountLocked(err) {
return
}
tm.UserID = user.ID
@ -149,7 +149,7 @@ func (tm *TeamMember) MembershipExists(s *xorm.Session) (exists bool, err error)
func (tm *TeamMember) Update(s *xorm.Session, _ web.Auth) (err error) {
// Find the numeric user id
user, err := user2.GetUserByUsername(s, tm.Username)
if err != nil {
if err != nil && !user2.IsErrAccountDisabled(err) && !user2.IsErrAccountLocked(err) {
return
}
tm.UserID = user.ID

2
pkg/models/team_members_permissions.go
View File

@ -30,7 +30,7 @@ func (tm *TeamMember) CanCreate(s *xorm.Session, a web.Auth) (bool, error) {
// CanDelete checks if the user can delete a new team member
func (tm *TeamMember) CanDelete(s *xorm.Session, a web.Auth) (bool, error) {
u, err := user.GetUserByUsername(s, tm.Username)
if err != nil {
if err != nil && !user.IsErrAccountDisabled(err) && !user.IsErrAccountLocked(err) {
return false, err
}
if u.ID == a.GetID() {

2
pkg/modules/auth/ldap/ldap.go
View File

@ -264,7 +264,7 @@ func getOrCreateLdapUser(s *xorm.Session, entry *ldap.Entry) (u *user.User, err
Issuer: user.IssuerLDAP,
Subject: username,
})
if err != nil && !user.IsErrUserDoesNotExist(err) {
if err != nil && !user.IsErrUserDoesNotExist(err) && !user.IsErrAccountDisabled(err) && !user.IsErrAccountLocked(err) {
return nil, err
}

8
pkg/modules/auth/openid/openid.go
View File

@ -278,10 +278,10 @@ func getOrCreateUser(s *xorm.Session, cl *claims, provider *Provider, idToken *o
Issuer: idToken.Issuer,
Subject: idToken.Subject,
})
if err != nil && !user.IsErrUserDoesNotExist(err) {
if err != nil && !user.IsErrUserDoesNotExist(err) && !user.IsErrAccountDisabled(err) && !user.IsErrAccountLocked(err) {
return nil, err
}
alreadyCreatedFromIssuer = err == nil // found if no error, not found if we reach it here despite an error
alreadyCreatedFromIssuer = err == nil || user.IsErrAccountDisabled(err) || user.IsErrAccountLocked(err)
if !alreadyCreatedFromIssuer && (provider.EmailFallback || provider.UsernameFallback) {
@ -304,10 +304,10 @@ func getOrCreateUser(s *xorm.Session, cl *claims, provider *Provider, idToken *o
// Check if the user exists for the given fallback matching options
u, err = user.GetUserWithEmail(s, searchUser)
if err != nil && !user.IsErrUserDoesNotExist(err) {
if err != nil && !user.IsErrUserDoesNotExist(err) && !user.IsErrAccountDisabled(err) && !user.IsErrAccountLocked(err) {
return nil, err
}
fallbackMatchFound = err == nil // found if no error, not found if we reach it here despite an error
fallbackMatchFound = err == nil || user.IsErrAccountDisabled(err) || user.IsErrAccountLocked(err)
}
if !alreadyCreatedFromIssuer && !fallbackMatchFound {

4
pkg/routes/api/v1/avatar.go
View File

@ -55,12 +55,12 @@ func GetAvatar(c *echo.Context) error {
// Get the user
u, err := user.GetUserWithEmail(s, &user.User{Username: username})
if err != nil && !user.IsErrUserDoesNotExist(err) {
if err != nil && !user.IsErrUserDoesNotExist(err) && !user.IsErrAccountDisabled(err) && !user.IsErrAccountLocked(err) {
log.Errorf("Error getting user for avatar: %v", err)
return err
}
found := err == nil || !user.IsErrUserDoesNotExist(err)
found := err == nil || user.IsErrAccountDisabled(err) || user.IsErrAccountLocked(err)
avatarProvider := avatar.GetProvider(u)

23
pkg/routes/api/v1/login.go
View File

@ -239,23 +239,22 @@ func RefreshToken(c *echo.Context) (err error) {
}
u, err := user2.GetUserWithEmail(s, &user2.User{ID: session.UserID})
if user2.IsErrAccountDisabled(err) || user2.IsErrAccountLocked(err) {
if _, delErr := s.Where("id = ?", session.ID).Delete(&models.Session{}); delErr != nil {
_ = s.Rollback()
return delErr
}
if commitErr := s.Commit(); commitErr != nil {
return commitErr
}
auth.ClearRefreshTokenCookie(c)
return err
}
if err != nil {
_ = s.Rollback()
return err
}
if u.Status == user2.StatusDisabled || u.Status == user2.StatusAccountLocked {
if _, err := s.Where("id = ?", session.ID).Delete(&models.Session{}); err != nil {
_ = s.Rollback()
return err
}
if err := s.Commit(); err != nil {
return err
}
auth.ClearRefreshTokenCookie(c)
return &user2.ErrAccountDisabled{UserID: u.ID}
}
if err := s.Commit(); err != nil {
_ = s.Rollback()
return err