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

Allow current_password to be supplied when updating profile. #240

Merged
merged 1 commit into from
Jun 23, 2015
Merged

Allow current_password to be supplied when updating profile. #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions app/controllers/devise_token_auth/registrations_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,7 @@ def create

def update
if @resource

if @resource.update_attributes(account_update_params)
if @resource.send(resource_update_method, account_update_params)
yield @resource if block_given?
render json: {
status: 'success',
Expand Down Expand Up @@ -142,6 +141,14 @@ def account_update_params

private

def resource_update_method
if account_update_params.has_key?(:current_password)
"update_with_password"
else
"update_attributes"
end
end

def validate_sign_up_params
validate_post_data sign_up_params, 'Please submit proper sign up data in request body.'
end
Expand Down
12 changes: 12 additions & 0 deletions test/controllers/devise_token_auth/registrations_controller_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,18 @@ class DeviseTokenAuth::RegistrationsControllerTest < ActionDispatch::Integration
assert_equal @email.downcase, @existing_user.email
assert_equal @email.downcase, @existing_user.uid
end

test "Supply current password" do
@request_params.merge!(
current_password: "secret123",
email: "[email protected]",
)

put "/auth", @request_params, @auth_headers
@data = JSON.parse(response.body)
@existing_user.reload
assert_equal @existing_user.email, "[email protected]"
end
end

describe 'validate non-empty body' do
Expand Down
1 change: 1 addition & 0 deletions test/dummy/app/controllers/application_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,6 @@ def configure_permitted_parameters
devise_parameter_sanitizer.for(:sign_up) << :favorite_color
devise_parameter_sanitizer.for(:account_update) << :operating_thetan
devise_parameter_sanitizer.for(:account_update) << :favorite_color
devise_parameter_sanitizer.for(:account_update) << :current_password
end
end