diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2024-11-13 21:31:47 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-14 05:31:47 +0000 |
| commit | b4abb6deff14b741c7666d7579e0eea68443306c (patch) | |
| tree | 47e349b23bb942d0497219c99a85dc1124db9deb /services/oauth2_provider | |
| parent | 3f9c3e7bc394c115ccc4818d6505f1f68de350d2 (diff) | |
| download | gitea-b4abb6deff14b741c7666d7579e0eea68443306c.tar.gz gitea-b4abb6deff14b741c7666d7579e0eea68443306c.zip | |
Reimplement GetUserOrgsList to make it simple and clear (#32486)
Reimplement GetUserOrgsList and also move some functions and test to
org_list file.
---------
Co-authored-by: Zettat123 <zettat123@gmail.com>
Diffstat (limited to 'services/oauth2_provider')
| -rw-r--r-- | services/oauth2_provider/access_token.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/oauth2_provider/access_token.go b/services/oauth2_provider/access_token.go index 00c960caf2..f79afa4b30 100644 --- a/services/oauth2_provider/access_token.go +++ b/services/oauth2_provider/access_token.go @@ -8,6 +8,7 @@ import ( "fmt" auth "code.gitea.io/gitea/models/auth" + "code.gitea.io/gitea/models/db" org_model "code.gitea.io/gitea/models/organization" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/log" @@ -192,7 +193,10 @@ func NewAccessTokenResponse(ctx context.Context, grant *auth.OAuth2Grant, server // returns a list of "org" and "org:team" strings, // that the given user is a part of. func GetOAuthGroupsForUser(ctx context.Context, user *user_model.User) ([]string, error) { - orgs, err := org_model.GetUserOrgsList(ctx, user) + orgs, err := db.Find[org_model.Organization](ctx, org_model.FindOrgOptions{ + UserID: user.ID, + IncludePrivate: true, + }) if err != nil { return nil, fmt.Errorf("GetUserOrgList: %w", err) } |