mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-06-05 08:58:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'origin/main' into 'next-release/main'

Browse source
This commit is contained in:
oauth 2025-01-13 13:59:27 +00:00
commit e47380a377
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
server/forge/github/github.go
View file

@ -394,23 +394,24 @@ func (c *client) OrgMembership(ctx context.Context, u *model.User, owner string)
func (c *client) Org(ctx context.Context, u *model.User, owner string) (*model.Org, error) { func (c *client) Org(ctx context.Context, u *model.User, owner string) (*model.Org, error) {
client := c.newClientToken(ctx, u.AccessToken) client := c.newClientToken(ctx, u.AccessToken)
user, _, err := client.Users.Get(ctx, owner) org, _, err := client.Organizations.Get(ctx, owner)
log.Trace().Msgf("GitHub user for owner %s = %v", owner, user) log.Trace().Msgf("GitHub organization for owner %s = %v", owner, org)
if user != nil && err == nil { if org != nil && err == nil {
return &model.Org{ return &model.Org{
Name: user.GetLogin(), Name: org.GetLogin(),
IsUser: true, IsUser: false,
}, nil }, nil
} }
org, _, err := client.Organizations.Get(ctx, owner) user, _, err := client.Users.Get(ctx, owner)
log.Trace().Msgf("GitHub organization for owner %s = %v", owner, org) log.Trace().Msgf("GitHub user for owner %s = %v", owner, user)
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &model.Org{ return &model.Org{
Name: org.GetLogin(), Name: user.GetLogin(),
IsUser: true,
}, nil }, nil
} }