vikunja/vikunja
6
43
Fork 73
Code Issues 150 Pull Requests 21 Packages Releases 32 Activity

feat: assign users to teams via OIDC claims #1393

Merged
konrad merged 93 commits from viehlieb/api:950_reworked_assign_teams_via_oidc into main 2024-03-02 08:47:12 +00:00
Conversation 34 Commits 93 Files Changed 26 +8 -7
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6bd5efa00b - Show all commits

10
pkg/models/team_members.go
View File

@ -115,13 +115,13 @@ func (tm *TeamMember) CheckMembership(s *xorm.Session) (exists bool, err error)
return exists, err
}
func (tm *TeamMember) GetMemberCount(s *xorm.Session) (memberCount int, err error) {
members := []TeamMember{}
err = s.
func (tm *TeamMember) GetMemberCount(s *xorm.Session) (memberCount int64, err error) {
member := TeamMember{}
memberCount, err = s.
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-02-23 15:24:19 +00:00
Outdated
Review
Copy Link

Couldn't you just return the result here directly?

Couldn't you just return the result here directly?
viehlieb commented 2023-03-10 12:10:00 +00:00
Outdated
Review
Copy Link

In fact this function is not needed anymore for this feature, so I'll just remove it.
It was used for finding out whether a user should be signed out from team or deleted.

In fact this function is not needed anymore for this feature, so I'll just remove it. It was used for finding out whether a user should be signed out from team or deleted.
👍 1
Where("team_id = ?", tm.TeamID).
Cols("user_id").
Find(&members)
return len(members), err
Count(&member)
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-02-14 11:38:07 +00:00
Outdated
Review
Copy Link

If it's only counting, please use Count().

If it's only counting, please use `Count()`.
viehlieb commented 2023-02-23 14:43:46 +00:00
Outdated
Review
Copy Link

done

done
return memberCount, err
}
// Update toggles a team member's admin status

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

@ -216,7 +216,8 @@ func HandleCallback(c echo.Context) error {
if err != nil {
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-02-13 10:24:55 +00:00
Outdated
Review
Copy Link

Please don't ignore the error.

Please don't ignore the error.
log.Errorf("Could not proceed with group routine %v", err)
}
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-10-18 15:17:33 +00:00
Outdated
Review
Copy Link

Please don't call this "Sign out". That's a different thing.

Please don't call this "Sign out". That's a different thing.
errs = SignOutFromOrDeleteTeamsByID(s, u, utils.NotIn(oldOidcTeams, oidcTeams))
errs = SignOutFromTeamsByID(s, u, utils.NotIn(oldOidcTeams, oidcTeams))
log.Errorf("%v", errs)
for _, err := range errs {
log.Errorf("Found Error while signing out from teams %v", err)
}
@ -293,7 +294,7 @@ func RemoveUserFromTeamsByIds(s *xorm.Session, u *user.User, teamIDs []int64) (e
if !exists {
continue
}
err := tm.Delete(s, u)
err = tm.Delete(s, u)
// if you cannot delete the team_member
if err != nil {
errs = append(errs, err)
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-02-13 10:37:10 +00:00
Outdated
Review
Copy Link

The return here will mean if one team claim is invalid, it will not try to validate any others. Is that what you intended?

The return here will mean if one team claim is invalid, it will not try to validate any others. Is that what you intended?
viehlieb commented 2023-02-23 14:57:17 +00:00
Outdated
Review
Copy Link

changed behaviour to skipping the invalid team

changed behaviour to skipping the invalid team