vikunja
/
vikunja
6
43
Fork 72
Code Issues 150 Pull Requests 19 Packages Releases 32 Activity

delete sso teams on login if empty

This commit is contained in:
viehlieb 2023-11-08 14:50:14 +01:00 committed by kolaente
parent 1ef77a1b19
commit c283e876b0
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,10 +217,12 @@ func HandleCallback(c echo.Context) error {
if err != nil {
log.Errorf("Could not proceed with group routine %v", err)
}
err = RemoveUserFromTeamsByIds(s, u, utils.NotIn(oldOidcTeams, oidcTeams))
teamIDsToLeave := utils.NotIn(oldOidcTeams, oidcTeams)
err = RemoveUserFromTeamsByIds(s, u, teamIDsToLeave)
if err != nil {
log.Errorf("Found error while leaving teams %v", err)
}
err = RemoveEmptySSOTeams(s, u, teamIDsToLeave)
}
err = s.Commit()
if err != nil {
@ -257,6 +259,17 @@ func AssignOrCreateUserToTeams(s *xorm.Session, u *user.User, teamData []models.
return oidcTeams, err
}
func RemoveEmptySSOTeams(s *xorm.Session, u *user.User, teamIDs []int64) (err 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{})
}
}
return err
}
func RemoveUserFromTeamsByIds(s *xorm.Session, u *user.User, teamIDs []int64) (err error) {
if len(teamIDs) < 1 {
@ -269,7 +282,6 @@ func RemoveUserFromTeamsByIds(s *xorm.Session, u *user.User, teamIDs []int64) (e
}
log.Debugf("Removing team_member with user_id %v from team_ids %v", u.ID, strings.Join(strSlice, ","))
_, err = s.Where("team_id IN (?) AND user_id = ?", strings.Join(strSlice, ","), u.ID).Delete(&models.TeamMember{})
return err
}

2
pkg/utils/slice_difference.go
View File

@ -16,7 +16,7 @@
package utils
// find the elements which appear in slice1,but not in slice2
// find the elements which appear in slice1, but not in slice2
func NotIn(slice1 []int64, slice2 []int64) []int64 {
var diff []int64