change too generic name TeamData struct to OIDCTeamData
This commit is contained in:
parent
f6ce982686
commit
481fa9d081
|
@ -94,8 +94,8 @@ type TeamUser struct {
|
||||||
TeamID int64 `json:"-"`
|
TeamID int64 `json:"-"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// TeamData is the relevant data for a team and is delivered by oidc token
|
// OIDCTeamData is the relevant data for a team and is delivered by oidc token
|
||||||
type TeamData struct {
|
type OIDCTeamData struct {
|
||||||
TeamName string
|
TeamName string
|
||||||
OidcID string
|
OidcID string
|
||||||
Description string
|
Description string
|
||||||
|
|
|
@ -227,7 +227,7 @@ func HandleCallback(c echo.Context) error {
|
||||||
return auth.NewUserAuthTokenResponse(u, c, false)
|
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 {
|
if len(teamData) > 0 {
|
||||||
// check if we have seen these teams before.
|
// check if we have seen these teams before.
|
||||||
// find or create Teams and assign user as teammember.
|
// find or create Teams and assign user as teammember.
|
||||||
|
@ -273,8 +273,8 @@ func SignOutFromTeamsByID(s *xorm.Session, u *user.User, teamIDs []int64) (errs
|
||||||
return errs
|
return errs
|
||||||
}
|
}
|
||||||
|
|
||||||
func getTeamDataFromToken(groups []map[string]interface{}, provider *Provider) (teamData []models.TeamData, errs []error) {
|
func getTeamDataFromToken(groups []map[string]interface{}, provider *Provider) (teamData []models.OIDCTeamData, errs []error) {
|
||||||
teamData = []models.TeamData{}
|
teamData = []models.OIDCTeamData{}
|
||||||
errs = []error{}
|
errs = []error{}
|
||||||
for _, team := range groups {
|
for _, team := range groups {
|
||||||
var name string
|
var name string
|
||||||
|
@ -303,12 +303,12 @@ func getTeamDataFromToken(groups []map[string]interface{}, provider *Provider) (
|
||||||
errs = append(errs, &user.ErrOpenIDCustomScopeMalformed{})
|
errs = append(errs, &user.ErrOpenIDCustomScopeMalformed{})
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
teamData = append(teamData, models.TeamData{TeamName: name, OidcID: oidcID, Description: description})
|
teamData = append(teamData, models.OIDCTeamData{TeamName: name, OidcID: oidcID, Description: description})
|
||||||
}
|
}
|
||||||
return teamData, errs
|
return teamData, errs
|
||||||
}
|
}
|
||||||
|
|
||||||
func CreateTeamWithData(s *xorm.Session, teamData models.TeamData, u *user.User) (team *models.Team, err error) {
|
func CreateTeamWithData(s *xorm.Session, teamData models.OIDCTeamData, 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,
|
||||||
|
@ -319,7 +319,7 @@ func CreateTeamWithData(s *xorm.Session, teamData models.TeamData, u *user.User)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 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 []models.TeamData, u *user.User) (te []*models.Team, err error) {
|
func GetOrCreateTeamsByOIDCAndNames(s *xorm.Session, teamData []models.OIDCTeamData, 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 {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user