vikunja/vikunja
6
43
Fork 73
Code Issues 150 Pull Requests 20 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 +4 -9
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a7c1fb919c - Show all commits

13
pkg/models/teams.go
View File

@ -82,7 +82,7 @@ type TeamMember struct {
}
// TableName makes beautiful table names
func (TeamMember) TableName() string {
func (*TeamMember) TableName() string {
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-02-13 10:18:40 +00:00
Outdated
Review
Copy Link

Why did you change this?

Why did you change this?
viehlieb commented 2023-02-13 17:49:59 +00:00
Outdated
Review
Copy Link

oha.
this was unintended.

oha. this was unintended.
return "team_members"
}
@ -94,6 +94,7 @@ type TeamUser struct {
TeamID int64 `json:"-"`
}
// TeamData is the relevant data for a team and is delivered by oidc token
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-02-13 10:18:58 +00:00
Outdated
Review
Copy Link

What is this used for? Please add a comment.

What is this used for? Please add a comment.
konrad commented 2023-02-14 11:39:47 +00:00
Outdated
Review
Copy Link

What's the difference to the Team struct?

What's the difference to the `Team` struct?
viehlieb commented 2023-02-23 14:54:33 +00:00
Outdated
Review
Copy Link

Intermediate struct which only holds TeamName and OidcId Description.
It does not exist as a Team yet or better: it is the data accessible via oidc, which the Team struct is compared against.

Intermediate struct which only holds TeamName and OidcId Description. It does not exist as a Team yet or better: it is the data accessible via oidc, which the Team struct is compared against.
konrad commented 2023-02-23 15:25:50 +00:00
Outdated
Review
Copy Link

Okay, but isn't it missing the json tags then? I'm not sure if I understood you correctly herre.

If it's only used for oidc data the name should reflect that. TeamData is too generic.

Okay, but isn't it missing the json tags then? I'm not sure if I understood you correctly herre. If it's only used for oidc data the name should reflect that. `TeamData` is too generic.
viehlieb commented 2023-02-23 15:33:00 +00:00
Outdated
Review
Copy Link

No, the teamData has to be pulled out of token via

getTeamDataFromToken

Called it OIDCTeamData now.

No, the teamData has to be pulled out of token via `getTeamDataFromToken` Called it OIDCTeamData now.
type TeamData struct {
TeamName string
OidcID string
@ -166,7 +167,7 @@ func FindAllOidcTeamIDsForUser(s *xorm.Session, userID int64) (ts []int64, err e
Table("team_members").
Where("user_id = ? ", userID).
Join("RIGHT", "teams", "teams.id = team_members.team_id").
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-02-13 10:21:02 +00:00
Outdated
Review
Copy Link

Can teams.oidc_id be null? Then you should check that as well.

Can `teams.oidc_id` be null? Then you should check that as well.
Where("teams.oidc_id != ?", "").
Where("teams.oidc_id != ? AND teams.oidc_id IS NOT NULL", "").
Cols("teams.id").
Find(&ts)
if ts == nil || err != nil {
@ -325,8 +326,7 @@ func (t *Team) Create(s *xorm.Session, a web.Auth) (err error) {
return
}
var admin = true
tm := TeamMember{TeamID: t.ID, Username: doer.Username, Admin: admin}
tm := TeamMember{TeamID: t.ID, Username: doer.Username, Admin: true}
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-02-13 10:21:45 +00:00
Outdated
Review
Copy Link

Why the extra variable?

Why the extra variable?
viehlieb commented 2023-02-13 17:50:42 +00:00
Outdated
Review
Copy Link

manageAdmin func and this var are deleted from code, since not needed

manageAdmin func and this var are deleted from code, since not needed
viehlieb commented 2023-02-13 17:50:43 +00:00
Outdated
Review
Copy Link

manageAdmin func and this var are deleted from code, since not needed

manageAdmin func and this var are deleted from code, since not needed
if err = tm.Create(s, doer); err != nil {
return err
}
@ -337,11 +337,6 @@ func (t *Team) Create(s *xorm.Session, a web.Auth) (err error) {
})
}
func (t *Team) ManageAdminRight(teamMember TeamMember, admin bool) {
// Insert the current user as member and admin
teamMember.Admin = admin
}
// Delete deletes a team
// @Summary Deletes a team
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-02-13 10:22:50 +00:00
Outdated
Review
Copy Link

That's not what the function seems to be doing. Please change the name or comment.

That's not what the function seems to be doing. Please change the name or comment.
// @Description Delets a team. This will also remove the access for all users in that team.