Skip to content

Feature/caps 61 profile update patch #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YaoxuanZhang merged 2 commits into from
Mar 26, 2026
Merged

Feature/caps 61 profile update patch #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28d103b
fix(user): tightened perms to not allow auth users to update other us…
shamikkarkhanis Mar 26, 2026
93719de
fix(user): another pass
shamikkarkhanis Mar 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion internal/handler/users.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (h *Handler) UpdateUser(w http.ResponseWriter, r *http.Request) {
return
}

authenticatedUser, _, ok := h.requireAuthenticatedUserRecord(w, r)
authenticatedUser, ok := h.requireSelfOrDev(w, r, uid)
if !ok {
return
}
Expand Down
84 changes: 52 additions & 32 deletions internal/handler/users_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,33 +91,39 @@ func TestGetUser(t *testing.T) {

func TestUpdateUser(t *testing.T) {
targetUID := uuid.New()
authenticatedUID := uuid.New()
otherUID := uuid.New()
firstName := "Updated"
currentRole := "student"
role := "faculty"
newRole := "faculty"

tests := []struct {
name string
requestBody dto.UpdateUserRequest
mockSetup func(*mocks.Querier)
setupContext func() context.Context
mockSetup func(*mocks.Querier)
expectedStatus int
}{
{
name: "NonDevCanUpdateWhenSubmittedRoleMatchesCurrentRole",
name: "SelfCanUpdateWhenRoleUnchanged",
requestBody: dto.UpdateUserRequest{
FirstName: &firstName,
Role: &currentRole,
},
setupContext: func() context.Context {
ctx := context.Background()
claims := &middleware.UserClaims{UserID: targetUID.String()}
ctx = context.WithValue(ctx, middleware.UserClaimsKey, claims)
return context.WithValue(ctx, middleware.AuthTypeKey, "human")
},
mockSetup: func(m *mocks.Querier) {
m.On("GetUserByID", mock.Anything, authenticatedUID).Return(database.User{
Uid: authenticatedUID,
m.On("GetUserByID", mock.Anything, targetUID).Return(database.User{
Uid: targetUID,
Role: database.NullUserRole{UserRole: database.UserRoleStudent, Valid: true},
}, nil)
}, nil).Once()
m.On("GetUserByID", mock.Anything, targetUID).Return(database.User{
Uid: targetUID,
Role: database.NullUserRole{UserRole: database.UserRoleStudent, Valid: true},
}, nil)
}, nil).Once()
m.On("UpdateUser", mock.Anything, mock.MatchedBy(func(arg database.UpdateUserParams) bool {
return arg.Uid == targetUID &&
arg.FirstName.Valid && arg.FirstName.String == firstName &&
Expand All @@ -129,45 +135,65 @@ func TestUpdateUser(t *testing.T) {
Role: database.NullUserRole{UserRole: database.UserRoleStudent, Valid: true},
}, nil)
},
expectedStatus: http.StatusOK,
},
{
name: "NonDevCannotUpdateAnotherUser",
requestBody: dto.UpdateUserRequest{
FirstName: &firstName,
Role: &currentRole,
},
setupContext: func() context.Context {
ctx := context.Background()
claims := &middleware.UserClaims{UserID: authenticatedUID.String()}
claims := &middleware.UserClaims{UserID: otherUID.String()}
ctx = context.WithValue(ctx, middleware.UserClaimsKey, claims)
return context.WithValue(ctx, middleware.AuthTypeKey, "human")
},
expectedStatus: http.StatusOK,
mockSetup: func(m *mocks.Querier) {
m.On("GetUserByID", mock.Anything, otherUID).Return(database.User{
Uid: otherUID,
Role: database.NullUserRole{UserRole: database.UserRoleStudent, Valid: true},
}, nil)
},
expectedStatus: http.StatusForbidden,
},
{
name: "NonDevCannotUpdateRole",
name: "NonDevCannotChangeOwnRole",
requestBody: dto.UpdateUserRequest{
Role: &role,
Role: &newRole,
},
setupContext: func() context.Context {
ctx := context.Background()
claims := &middleware.UserClaims{UserID: targetUID.String()}
ctx = context.WithValue(ctx, middleware.UserClaimsKey, claims)
return context.WithValue(ctx, middleware.AuthTypeKey, "human")
},
mockSetup: func(m *mocks.Querier) {
m.On("GetUserByID", mock.Anything, authenticatedUID).Return(database.User{
Uid: authenticatedUID,
m.On("GetUserByID", mock.Anything, targetUID).Return(database.User{
Uid: targetUID,
Role: database.NullUserRole{UserRole: database.UserRoleStudent, Valid: true},
}, nil)
}, nil).Once()
m.On("GetUserByID", mock.Anything, targetUID).Return(database.User{
Uid: targetUID,
Role: database.NullUserRole{UserRole: database.UserRoleStudent, Valid: true},
}, nil)
},
setupContext: func() context.Context {
ctx := context.Background()
claims := &middleware.UserClaims{UserID: authenticatedUID.String()}
ctx = context.WithValue(ctx, middleware.UserClaimsKey, claims)
return context.WithValue(ctx, middleware.AuthTypeKey, "human")
}, nil).Once()
},
expectedStatus: http.StatusForbidden,
},
{
name: "DevCanUpdateRole",
name: "DevCanChangeAnotherUsersRole",
requestBody: dto.UpdateUserRequest{
Role: &role,
Role: &newRole,
},
setupContext: func() context.Context {
ctx := context.Background()
claims := &middleware.UserClaims{UserID: otherUID.String()}
ctx = context.WithValue(ctx, middleware.UserClaimsKey, claims)
return context.WithValue(ctx, middleware.AuthTypeKey, "human")
},
mockSetup: func(m *mocks.Querier) {
m.On("GetUserByID", mock.Anything, authenticatedUID).Return(database.User{
Uid: authenticatedUID,
m.On("GetUserByID", mock.Anything, otherUID).Return(database.User{
Uid: otherUID,
Role: database.NullUserRole{UserRole: database.UserRoleDev, Valid: true},
}, nil)
m.On("GetUserByID", mock.Anything, targetUID).Return(database.User{
Expand All @@ -183,12 +209,6 @@ func TestUpdateUser(t *testing.T) {
Role: database.NullUserRole{UserRole: database.UserRoleFaculty, Valid: true},
}, nil)
},
setupContext: func() context.Context {
ctx := context.Background()
claims := &middleware.UserClaims{UserID: authenticatedUID.String()}
ctx = context.WithValue(ctx, middleware.UserClaimsKey, claims)
return context.WithValue(ctx, middleware.AuthTypeKey, "human")
},
expectedStatus: http.StatusOK,
},
}
Expand Down
Loading