Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf9616bd

Browse files
committed
Add OAuth2 app filtering by user
1 parent4f78d52 commitf9616bd

File tree

3 files changed

+67
-6
lines changed

3 files changed

+67
-6
lines changed

‎codersdk/oauth2.go

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,21 @@ type OAuth2ProviderApp struct {
1616
Iconstring`json:"icon"`
1717
}
1818

19+
typeOAuth2ProviderAppFilterstruct {
20+
UserID uuid.UUID`json:"user_id,omitempty" format:"uuid"`
21+
}
22+
1923
// OAuth2ProviderApps returns the applications configured to authenticate using
2024
// Coder as an OAuth2 provider.
21-
func (c*Client)OAuth2ProviderApps(ctx context.Context) ([]OAuth2ProviderApp,error) {
22-
res,err:=c.Request(ctx,http.MethodGet,"/api/v2/oauth2-provider/apps",nil)
25+
func (c*Client)OAuth2ProviderApps(ctx context.Context,filterOAuth2ProviderAppFilter) ([]OAuth2ProviderApp,error) {
26+
res,err:=c.Request(ctx,http.MethodGet,"/api/v2/oauth2-provider/apps",nil,
27+
func(r*http.Request) {
28+
iffilter.UserID!=uuid.Nil {
29+
q:=r.URL.Query()
30+
q.Set("user_id",filter.UserID.String())
31+
r.URL.RawQuery=q.Encode()
32+
}
33+
})
2334
iferr!=nil {
2435
return []OAuth2ProviderApp{},err
2536
}

‎enterprise/coderd/oauth2.go

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package coderd
22

33
import (
44
"crypto/sha256"
5+
"fmt"
56
"net/http"
67

78
"github.com/google/uuid"
@@ -45,15 +46,47 @@ func (api *API) oAuth2ProviderMiddleware(next http.Handler) http.Handler {
4546
// @Security CoderSessionToken
4647
// @Produce json
4748
// @Tags Enterprise
49+
// @Param user_id query string false "Filter by applications authorized for a user"
4850
// @Success 200 {array} codersdk.OAuth2ProviderApp
4951
// @Router /oauth2-provider/apps [get]
5052
func (api*API)oAuth2ProviderApps(rw http.ResponseWriter,r*http.Request) {
5153
ctx:=r.Context()
52-
dbApps,err:=api.Database.GetOAuth2ProviderApps(ctx)
54+
55+
rawUserID:=r.URL.Query().Get("user_id")
56+
ifrawUserID=="" {
57+
dbApps,err:=api.Database.GetOAuth2ProviderApps(ctx)
58+
iferr!=nil {
59+
httpapi.InternalServerError(rw,err)
60+
return
61+
}
62+
httpapi.Write(ctx,rw,http.StatusOK,db2sdk.OAuth2ProviderApps(dbApps))
63+
return
64+
}
65+
66+
userID,err:=uuid.Parse(rawUserID)
67+
iferr!=nil {
68+
httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{
69+
Message:"Invalid user UUID",
70+
Detail:fmt.Sprintf("queried user_id=%q",userID),
71+
})
72+
return
73+
}
74+
75+
userApps,err:=api.Database.GetOAuth2ProviderAppsByUserID(ctx,userID)
5376
iferr!=nil {
5477
httpapi.InternalServerError(rw,err)
5578
return
5679
}
80+
81+
vardbApps []database.OAuth2ProviderApp
82+
for_,app:=rangeuserApps {
83+
dbApps=append(dbApps, database.OAuth2ProviderApp{
84+
ID:app.OAuth2ProviderApp.ID,
85+
Name:app.OAuth2ProviderApp.Name,
86+
CallbackURL:app.OAuth2ProviderApp.CallbackURL,
87+
Icon:app.OAuth2ProviderApp.Icon,
88+
})
89+
}
5790
httpapi.Write(ctx,rw,http.StatusOK,db2sdk.OAuth2ProviderApps(dbApps))
5891
}
5992

‎enterprise/coderd/oauth2_test.go

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func TestOAuth2ProviderApps(t *testing.T) {
188188
ctx:=testutil.Context(t,testutil.WaitLong)
189189

190190
// No apps yet.
191-
apps,err:=another.OAuth2ProviderApps(ctx)
191+
apps,err:=another.OAuth2ProviderApps(ctx, codersdk.OAuth2ProviderAppFilter{})
192192
require.NoError(t,err)
193193
require.Len(t,apps,0)
194194

@@ -200,7 +200,7 @@ func TestOAuth2ProviderApps(t *testing.T) {
200200
}
201201

202202
// Should get all the apps now.
203-
apps,err=another.OAuth2ProviderApps(ctx)
203+
apps,err=another.OAuth2ProviderApps(ctx, codersdk.OAuth2ProviderAppFilter{})
204204
require.NoError(t,err)
205205
require.Len(t,apps,5)
206206
require.Equal(t,expectedOrder,apps)
@@ -244,12 +244,29 @@ func TestOAuth2ProviderApps(t *testing.T) {
244244
require.NoError(t,err)
245245

246246
// Should show the new count.
247-
newApps,err:=another.OAuth2ProviderApps(ctx)
247+
newApps,err:=another.OAuth2ProviderApps(ctx, codersdk.OAuth2ProviderAppFilter{})
248248
require.NoError(t,err)
249249
require.Len(t,newApps,4)
250250

251251
require.Equal(t,expectedOrder[1:],newApps)
252252
})
253+
254+
t.Run("ByUser",func(t*testing.T) {
255+
t.Parallel()
256+
client,owner:=coderdenttest.New(t,&coderdenttest.Options{LicenseOptions:&coderdenttest.LicenseOptions{
257+
Features: license.Features{
258+
codersdk.FeatureOAuth2Provider:1,
259+
},
260+
}})
261+
another,user:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID)
262+
ctx:=testutil.Context(t,testutil.WaitLong)
263+
_=generateApps(ctx,t,client)
264+
apps,err:=another.OAuth2ProviderApps(ctx, codersdk.OAuth2ProviderAppFilter{
265+
UserID:user.ID,
266+
})
267+
require.NoError(t,err)
268+
require.Len(t,apps,0)
269+
})
253270
}
254271

255272
funcTestOAuth2ProviderAppSecrets(t*testing.T) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp