local-it/vikunja-api
0
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix minor issue in error.go

Browse source
This commit is contained in:
viehlieb 2022-10-12 13:55:36 +02:00
parent 93abfc41fc
commit 959811ae31
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/models/error.go
View file

@ -1106,7 +1106,7 @@ func IsErrTeamsDoNotExist(err error) bool {
} }
func (err ErrTeamsDoNotExist) Error() string { func (err ErrTeamsDoNotExist) Error() string {
return fmt.Sprintf("Team does not exist [Team ID: %d]", err.Name) return fmt.Sprintf("Team does not exist [Team Name: %v]", err.Name)
} }
// ErrCodeTeamDoesNotExist holds the unique world-error code of this error // ErrCodeTeamDoesNotExist holds the unique world-error code of this error

10
pkg/modules/auth/openid/openid.go
View file

@ -200,7 +200,7 @@ func HandleCallback(c echo.Context) error {
} }
// Check if we have seen this user before // Check if we have seen this user before
teams := GetOrCreateTeamsByNames(s, cl.Group, u) teams, err := GetOrCreateTeamsByNames(s, cl.Group, u)
if err != nil { if err != nil {
log.Errorf("Error verifying team for name %v, got %v", cl.Name, teams, err) log.Errorf("Error verifying team for name %v, got %v", cl.Name, teams, err)
return err return err
@ -227,10 +227,7 @@ func HandleCallback(c echo.Context) error {
return auth.NewUserAuthTokenResponse(u, c, false) return auth.NewUserAuthTokenResponse(u, c, false)
} }
func GetOrCreateTeamsByNames(s *xorm.Session, teamNames []string, u *user.User) (te []models.Team) { func GetOrCreateTeamsByNames(s *xorm.Session, teamNames []string, u *user.User) (te []models.Team, err error) {
// Check if a team with given name exists should be after user creation
//TODO: 1. Create team if not exist
te = []models.Team{} te = []models.Team{}
for _, t := range teamNames { for _, t := range teamNames {
team, err := models.GetTeamsByName(s, t) team, err := models.GetTeamsByName(s, t)
@ -240,7 +237,6 @@ func GetOrCreateTeamsByNames(s *xorm.Session, teamNames []string, u *user.User)
tea := &models.Team{ tea := &models.Team{
Name: t, Name: t,
} }
// TODO: here the user who creates the Team is automatically admin. That shoud not be the case..?
err := tea.CreateNoAdmin(s, u) err := tea.CreateNoAdmin(s, u)
if err != nil { if err != nil {
log.Errorf("Teams: %v, err: %v", tea, err) log.Errorf("Teams: %v, err: %v", tea, err)
@ -256,7 +252,7 @@ func GetOrCreateTeamsByNames(s *xorm.Session, teamNames []string, u *user.User)
} }
} }
} }
return te return te, err
} }
// assign user to team // assign user to team