public_git
/
oauth2-proxy
mirror of https://github.com/oauth2-proxy/oauth2-proxy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bugfix: Gitaa team membership 

Gitea doesn't properly fill in all the fields like GitHub,
so implement a series of fallbacks.

Signed-off-by: magic_rb <magic_rb@redalder.org>
This commit is contained in:
magic_rb 2025-08-04 14:49:52 +02:00 committed by Jan Larwig
parent f18a0b7b07
commit 11258ba612
No known key found for this signature in database
GPG Key ID: C2172BFA220A037A
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
providers/github.go
View File

@ -464,6 +464,7 @@ func (p *GitHubProvider) getOrgs(ctx context.Context, s *sessions.SessionState)
type Organization struct {
Login string `json:"login"`
Name string `json:"name"`
}
pn := 1
@ -490,8 +491,12 @@ func (p *GitHubProvider) getOrgs(ctx context.Context, s *sessions.SessionState)
}
for _, org := range orgs {
logger.Printf("Member of Github Organization:%q", org.Login)
s.Groups = append(s.Groups, org.Login)
orgName := org.Login
if orgName == "" {
orgName = org.Name
}
logger.Printf("Member of Github Organization:%q", orgName)
s.Groups = append(s.Groups, orgName)
}
pn++
}
@ -506,6 +511,7 @@ func (p *GitHubProvider) getTeams(ctx context.Context, s *sessions.SessionState)
Slug string `json:"slug"`
Org struct {
Login string `json:"login"`
Name string `json:"name"`
} `json:"organization"`
}
@ -533,7 +539,15 @@ func (p *GitHubProvider) getTeams(ctx context.Context, s *sessions.SessionState)
}
for _, team := range teams {
logger.Printf("Member of Github Organization/Team: %q/%q", team.Org.Login, team.Slug)
orgName := team.Org.Login
if orgName == "" {
orgName = team.Org.Name
}
teamName := team.Slug
if teamName == "" {
teamName = team.Name
}
logger.Printf("Member of Github Organization/Team:%q/%q", orgName, teamName)
s.Groups = append(s.Groups, fmt.Sprintf("%s%s%s", team.Org.Login, orgTeamSeparator, team.Slug))
}