vikunja/vikunja
6
43
Fork 72
Code Issues 151 Pull Requests 17 Packages Releases 32 Activity

wip assign groups via oidc

Browse Source
This commit is contained in:
viehlieb 2022-12-07 15:32:58 +01:00
parent 69391fa0fb
commit a7565513d7
3 changed files with 5 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/models/team_members.go
View File

@ -53,7 +53,7 @@ func (tm *TeamMember) Create(s *xorm.Session, a web.Auth) (err error) {
// Check if that user is already part of the team
exists, err := s.
Where("team_id = ? AND user_id = ?", tm.TeamID, tm.UserID).
Where("team_id = ? AND user_name = ?", tm.TeamID, tm.UserID).
Get(&TeamMember{})
if err != nil {
return

40
pkg/models/teams.go
View File

@ -128,6 +128,8 @@ func GetTeamByID(s *xorm.Session, id int64) (team *Team, err error) {
return
}
// GetTeamByID gets teams by name
func GetTeamsByName(s *xorm.Session, name string) (teams []*Team, err error) {
if name == "" {
return teams, ErrTeamsDoNotExist{name}
@ -144,14 +146,6 @@ func GetTeamsByName(s *xorm.Session, name string) (teams []*Team, err error) {
if len(ts) == 0 {
return ts, ErrTeamsDoNotExist{name}
}
// //for each ts
// teamSlice := []*Team{ts}
// err = addMoreInfoToTeams(s, teamSlice)
// if err != nil {
// return
// }
teams = ts
return
@ -347,35 +341,9 @@ func (t *Team) Create(s *xorm.Session, a web.Auth) (err error) {
})
}
func (t *Team) CreateNoAdmin(s *xorm.Session, a web.Auth) (err error) {
doer, err := user.GetFromAuth(a)
if err != nil {
return err
}
// Check if we have a name
if t.Name == "" {
return ErrTeamNameCannotBeEmpty{}
}
t.CreatedByID = doer.ID
t.CreatedBy = doer
_, err = s.Insert(t)
if err != nil {
return
}
func (t *Team) ManageAdminRight(teamMember TeamMember, admin bool) {
// Insert the current user as member and admin
tm := TeamMember{TeamID: t.ID, Username: doer.Username, Admin: false}
if err = tm.Create(s, doer); err != nil {
return err
}
return events.Dispatch(&TeamCreatedEvent{
Team: t,
Doer: a,
})
teamMember.Admin = admin
}
// Delete deletes a team

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

@ -192,8 +192,6 @@ func HandleCallback(c echo.Context) error {
// Check if we have seen this user before
u, err := getOrCreateUser(s, cl, idToken.Issuer, idToken.Subject)
log.Errorf("Issuer %s: %v", idToken.Issuer, err)
if err != nil {
_ = s.Rollback()
log.Errorf("Error creating new user for provider %s: %v", provider.Name, err)