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

9
pkg/models/teams.go
View File

@ -131,17 +131,18 @@ func GetTeamByID(s *xorm.Session, id int64) (team *Team, err error) {
// 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, oidcID string, teamName string) (team Team, err error) {
func GetTeamByOidcIDAndName(s *xorm.Session, oidcID string, teamName string) (*Team, error) {
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
team := &Team{}
has, err := s.
Table("teams").
Where("oidc_id = ? AND name = ?", oidcID, teamName).
Asc("id").
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
Limit(1).
Get(&team)
Get(team)
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`.
if !has || err != nil {
return team, ErrOIDCTeamDoesNotExist{teamName, oidcID}
return nil, ErrOIDCTeamDoesNotExist{teamName, oidcID}
}
return team, err
return team, nil
}
func FindAllOidcTeamIDsForUser(s *xorm.Session, userID int64) (ts []int64, err error) {