Skip to content

Commit 781c125

Browse files
committed
fix: remove AsSystemUser from users extract mw
1 parent 35538e1 commit 781c125

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

coderd/httpmw/userparam.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func ExtractUserParam(db database.Store, redirectToLoginOnMe bool) func(http.Han
8282
}
8383
} else if userID, err := uuid.Parse(userQuery); err == nil {
8484
//nolint:gocritic // If the userQuery is a valid uuid
85-
user, err = db.GetUserByID(dbauthz.AsSystemRestricted(ctx), userID)
85+
user, err = db.GetUserByID(ctx, userID)
8686
if err != nil {
8787
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
8888
Message: userErrorMessage,
@@ -92,7 +92,7 @@ func ExtractUserParam(db database.Store, redirectToLoginOnMe bool) func(http.Han
9292
}
9393
} else {
9494
// nolint:gocritic // Try as a username last
95-
user, err = db.GetUserByEmailOrUsername(dbauthz.AsSystemRestricted(ctx), database.GetUserByEmailOrUsernameParams{
95+
user, err = db.GetUserByEmailOrUsername(ctx, database.GetUserByEmailOrUsernameParams{
9696
Username: userQuery,
9797
})
9898
if err != nil {

coderd/users_test.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,6 +1192,20 @@ func TestGetUser(t *testing.T) {
11921192
require.NoError(t, err)
11931193
require.Equal(t, exp, user)
11941194
})
1195+
t.Run("NoAuth", func(t *testing.T) {
1196+
t.Parallel()
1197+
1198+
client := coderdtest.New(t, nil)
1199+
firstUser := coderdtest.CreateFirstUser(t, client)
1200+
1201+
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
1202+
defer cancel()
1203+
1204+
uClient, _ := coderdtest.CreateAnotherUser(t, client, firstUser.OrganizationID)
1205+
1206+
_, err := uClient.User(ctx, firstUser.UserID.String())
1207+
require.NoError(t, err)
1208+
})
11951209
}
11961210

11971211
// TestUsersFilter creates a set of users to run various filters against for testing.

0 commit comments

Comments
 (0)