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

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

@ -231,7 +231,7 @@ func HandleCallback(c echo.Context) error {
return auth.NewUserAuthTokenResponse(u, c, false)
}
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-04-17 16:21:36 +00:00
Outdated
Review
Copy Link

Replace with

if len(teamData) < 1 {
	return
}
Replace with ``` if len(teamData) < 1 { return }
viehlieb commented 2023-05-03 15:09:07 +00:00
Outdated
Review
Copy Link

It could well be, that only a single team is received through the oidc token.

It could well be, that only a single team is received through the oidc token.
konrad commented 2023-05-06 16:13:14 +00:00
Outdated
Review
Copy Link

But len(teamData) < 1 will only be true if there are 0 teams received?

I should have phrased it better, this is equivalent:

if len(teamData) == 0 {
	return
}
But `len(teamData) < 1` will only be true if there are 0 teams received? I should have phrased it better, this is equivalent: ``` if len(teamData) == 0 { return } ```
viehlieb commented 2023-05-08 11:43:19 +00:00
Outdated
Review
Copy Link

yes, that's true of course. i do not know why i read it differently.

yes, that's true of course. i do not know why i read it differently.
👍 1
viehlieb marked this conversation as resolved Outdated
konrad commented 2023-02-13 10:25:53 +00:00
Outdated
Review
Copy Link

This should be an Error log message.

This should be an `Error` log message.
func AssignOrCreateUserToTeams(s *xorm.Session, u *user.User, teamData []models.TeamData) (oidcTeams []int64, err error) {
func AssignOrCreateUserToTeams(s *xorm.Session, u *user.User, teamData []models.OIDCTeamData) (oidcTeams []int64, err error) {
if len(teamData) > 0 {
// check if we have seen these teams before.
// find or create Teams and assign user as teammember.
@ -340,7 +340,11 @@ func getTeamDataFromToken(groups []map[string]interface{}, provider *Provider) (
}
func CreateTeamWithData(s *xorm.Session, teamData models.OIDCTeamData, u *user.User) (team *models.Team, err error) {
<<<<<<< HEAD
team = &models.Team{
=======
tea := &models.Team{
>>>>>>> b607fea4... change too generic name TeamData struct to OIDCTeamData
Name: teamData.TeamName,
Description: teamData.Description,
OidcID: teamData.OidcID,