vikunja
/
vikunja
6
43
Fork 72
Code Issues 150 Pull Requests 19 Packages Releases 32 Activity

use models.TeamData instead of declaring struct twice

This commit is contained in:
viehlieb 2023-02-13 17:26:22 +01:00
parent aea72cf18e
commit d2bee4bd50
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,11 +56,6 @@ type Provider struct {
openIDProvider *oidc.Provider openIDProvider *oidc.Provider
Oauth2Config *oauth2.Config `json:"-"` Oauth2Config *oauth2.Config `json:"-"`
} }
type TeamData struct {
TeamName string
OidcID string
Description string
}
type claims struct { type claims struct {
Email string `json:"email"` Email string `json:"email"`
Name string `json:"name"` Name string `json:"name"`
@ -265,8 +260,8 @@ func SignOutFromOrDeleteTeamsByID(s *xorm.Session, u *user.User, teamIDs []int64
} }
} }
func getTeamDataFromToken(groups interface{}, provider *Provider) (teamData []TeamData, err error) { func getTeamDataFromToken(groups interface{}, provider *Provider) (teamData []models.TeamData, err error) {
teamData = []TeamData{} teamData = []models.TeamData{}
if groups != nil { if groups != nil {
el := groups.([]interface{}) el := groups.([]interface{})
for _, data := range el { for _, data := range el {
@ -297,13 +292,13 @@ func getTeamDataFromToken(groups interface{}, provider *Provider) (teamData []Te
log.Errorf("Claim of your custom scope does not hold name or oidcID for automatic group assignment through oidc provider. Please check %s", provider.Name) log.Errorf("Claim of your custom scope does not hold name or oidcID for automatic group assignment through oidc provider. Please check %s", provider.Name)
return teamData, &user.ErrOpenIDCustomScopeMalformed{} return teamData, &user.ErrOpenIDCustomScopeMalformed{}
} }
teamData = append(teamData, TeamData{TeamName: name, OidcID: oidcID, Description: description}) teamData = append(teamData, models.TeamData{TeamName: name, OidcID: oidcID, Description: description})
} }
} }
return teamData, nil return teamData, nil
} }
func CreateTeamWithData(s *xorm.Session, teamData TeamData, u *user.User) (team *models.Team, err error) { func CreateTeamWithData(s *xorm.Session, teamData models.TeamData, u *user.User) (team *models.Team, err error) {
tea := &models.Team{ tea := &models.Team{
Name: teamData.TeamName, Name: teamData.TeamName,
Description: teamData.Description, Description: teamData.Description,
@ -316,7 +311,7 @@ func CreateTeamWithData(s *xorm.Session, teamData TeamData, u *user.User) (team
} }
// this functions creates an array of existing teams that was generated from the oidc data. // this functions creates an array of existing teams that was generated from the oidc data.
func GetOrCreateTeamsByOIDCAndNames(s *xorm.Session, teamData []TeamData, u *user.User) (te []models.Team, err error) { func GetOrCreateTeamsByOIDCAndNames(s *xorm.Session, teamData []models.TeamData, u *user.User) (te []models.Team, err error) {
te = []models.Team{} te = []models.Team{}
// Procedure can only be successful if oidcID is set and converted to string // Procedure can only be successful if oidcID is set and converted to string
for _, oidcTeam := range teamData { for _, oidcTeam := range teamData {