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

27
pkg/models/teams.go
View File

@ -123,7 +123,7 @@ func GetTeamByID(s *xorm.Session, id int64) (team *Team, err error) {
return
}
// GetTeamByID gets teams by name
// GetTeamByName gets teams by name
func GetTeamsByName(s *xorm.Session, name string) (teams []*Team, err error) {
if name == "" {
return teams, ErrTeamsDoNotExist{name}
@ -131,18 +131,28 @@ func GetTeamsByName(s *xorm.Session, name string) (teams []*Team, err error) {
var ts []*Team
exists := s.
err = s.
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-05-08 20:09:51 +00:00
Outdated
Review
Copy Link

Please return a pointer to a

Please return a pointer to a
viehlieb commented 2023-05-09 11:40:19 +00:00
Outdated
Review
Copy Link

team i suppose.done, tx

team i suppose.done, tx
Where("name = ?", name).
Find(&ts)
if exists != nil {
return
}
if len(ts) == 0 {
if err != nil || len(ts) == 0 {
return ts, ErrTeamsDoNotExist{name}
}
konrad marked this conversation as resolved Outdated
konrad commented 2023-02-23 15:27:05 +00:00
Outdated
Review
Copy Link

Did you try passing the

Did you try passing the
viehlieb commented 2023-03-10 12:11:15 +00:00
Outdated
Review
Copy Link

Ups, I guess here is something missing

Ups, I guess here is something missing
teams = ts
return teams, err
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-10-18 15:14:35 +00:00
Outdated
Review
Copy Link

Get will always return one entry, no need for Asc or Limit.

`Get` will always return one entry, no need for `Asc` or `Limit`.
}
return
// GetTeamByOidcIDAndName gets teams where oidc_id and name match parameters
// For oidc team creation oidcID and Name need to be set
func GetTeamByOidcIDAndName(s *xorm.Session, id string, name string) (team Team, err error) {
exists, err := s.
Table("teams").
Where("oidc_id = ? AND name = ?", id, name).
Get(&team)
log.Debugf("GetTeamByOidcIDAndName: %v, exists: %v", team.Name, exists)
if exists && err == nil {
return team, nil
}
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-02-23 15:28:08 +00:00
Outdated
Review
Copy Link

Please handle the error.

Please handle the error.
return team, ErrTeamsDoNotExist{id}
}
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-02-23 15:27:40 +00:00
Outdated
Review
Copy Link

What happens if there's more than one team with that combination (unlikely, but not handled)

What happens if there's more than one team with that combination (unlikely, but not handled)
viehlieb commented 2023-03-10 12:12:11 +00:00
Outdated
Review
Copy Link

I tend to just changing functionality to take the first team with that specific setting.

I tend to just changing functionality to take the first team with that specific setting.
konrad commented 2023-03-10 15:57:40 +00:00
Outdated
Review
Copy Link

That sounds like it could work. Easiest way would be to add a OrderBy clause here.

That sounds like it could work. Easiest way would be to add a `OrderBy` clause here.
func addMoreInfoToTeams(s *xorm.Session, teams []*Team) (err error) {
@ -295,8 +305,7 @@ func (t *Team) Create(s *xorm.Session, a web.Auth) (err error) {
return
}
var admin bool = true
// }
var admin = true
tm := TeamMember{TeamID: t.ID, Username: doer.Username, Admin: admin}
if err = tm.Create(s, doer); err != nil {
return err