ami/tl-vikunja
1
0
Fork 0
Code Activity

chore(auth): refactor removing empty openid teams to cron job

Browse Source
This commit is contained in:
kolaente
2024-03-11 17:20:05 +01:00
parent 09d5128050
commit 0910d5d2f2
4 changed files with 70 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -222,13 +222,7 @@ func HandleCallback(c echo.Context) error {
teamIDsToLeave := utils.NotIn(oldOidcTeams, oidcTeams)
err = RemoveUserFromTeamsByIDs(s, u, teamIDsToLeave)
if err != nil {
log.Errorf("Found error while leaving teams %v", err)
}
errs := RemoveEmptySSOTeams(s, teamIDsToLeave)
if len(errs) > 0 {
for _, err := range errs {
log.Errorf("Found error while removing empty teams %v", err)
}
log.Errorf("Error while leaving teams %v", err)
}
}
err = s.Commit()
@ -266,20 +260,6 @@ func AssignOrCreateUserToTeams(s *xorm.Session, u *user.User, teamData []*models
return oidcTeams, err
}
func RemoveEmptySSOTeams(s *xorm.Session, teamIDs []int64) (errs []error) {
for _, teamID := range teamIDs {
count, err := s.Where("team_id = ?", teamID).Count(&models.TeamMember{})
if count == 0 && err == nil {
log.Debugf("SSO team with id %v has no members. It will be deleted", teamID)
_, _err := s.Where("id = ?", teamID).Delete(&models.Team{})
if _err != nil {
errs = append(errs, _err)
}
}
}
return errs
}
func RemoveUserFromTeamsByIDs(s *xorm.Session, u *user.User, teamIDs []int64) (err error) {
if len(teamIDs) < 1 {