From 0824fd39d834c0b1c7e9b01e9f6e064b333fa198 Mon Sep 17 00:00:00 2001 From: viehlieb Date: Thu, 23 Feb 2023 16:32:20 +0100 Subject: [PATCH] change generic name TeamData struct to OIDCTeamData --- pkg/modules/auth/openid/openid.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/modules/auth/openid/openid.go b/pkg/modules/auth/openid/openid.go index 7e2b99852..d72297630 100644 --- a/pkg/modules/auth/openid/openid.go +++ b/pkg/modules/auth/openid/openid.go @@ -227,7 +227,7 @@ func HandleCallback(c echo.Context) error { return auth.NewUserAuthTokenResponse(u, c, false) } -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. @@ -336,7 +336,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,