change generic name TeamData struct to OIDCTeamData
This commit is contained in:
parent
d90bdaf713
commit
0824fd39d8
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue
Block a user