Skip to content
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

admins can change external users's names #5965

Merged
merged 5 commits into from
Nov 26, 2024
Merged

admins can change external users's names #5965

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bf02581
admins can change external users's names
alihadimazeh Nov 14, 2024
4be5646
Revert "admins can change external users's names"
alihadimazeh Nov 19, 2024
19084c4
admins can change an external user's name
alihadimazeh Nov 19, 2024
509ee97
- `UpdateUserForm` checks if user is an external and if the current user
alihadimazeh Nov 20, 2024
d033678
added method for permitted params for better readability
alihadimazeh Nov 25, 2024
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
4 changes: 3 additions & 1 deletion app/controllers/api/v1/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,9 @@ def create_user_params
end

def update_user_params
@update_user_params ||= if external_auth?
@update_user_params ||= if external_auth? && current_user.role.name.eql?('Administrator')
params.require(:user).permit(:name)
elsif external_auth?
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Greenlight is a bit more tricky than this. The "Administrator" role can be renamed, or the permission to edit users can be given to other roles, meaning that just this check isn't enough. What you need to do instead is check if the user has the ManageUsers permission

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here's how you would do that:

PermissionsChecker.new(current_user:, permission_names: 'ManageUsers', current_provider:).call

params.require(:user).permit(:password, :avatar, :language, :role_id, :invite_token)
else
params.require(:user).permit(:name, :password, :avatar, :language, :role_id, :invite_token)
Expand Down
8 changes: 4 additions & 4 deletions db/schema.rb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading