Skip to content

Fix email confirmation 500 #8224

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
mitchellhenke merged 2 commits into from
Apr 17, 2023
Merged

Fix email confirmation 500 #8224

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
8919a06
add failing spec
Apr 17, 2023
2c2d27b
Use strong parameters in email confirmation controller to fix 500 error
Apr 17, 2023
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
8 changes: 7 additions & 1 deletion app/controllers/users/email_confirmations_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ def create
def email_address
return @email_address if defined?(@email_address)

email_address = EmailAddress.find_with_confirmation_token(params[:confirmation_token])
email_address = EmailAddress.find_with_confirmation_token(
confirmation_params[:confirmation_token],
)
if email_address&.user&.confirmed?
@email_address = email_address
else
Expand Down Expand Up @@ -90,5 +92,9 @@ def email_address_already_confirmed_by_current_user?
user_signed_in? &&
email_confirmation_token_validator.email_address_already_confirmed_by_user?(current_user)
end

def confirmation_params
params.permit(:confirmation_token)
end
end
end
7 changes: 7 additions & 0 deletions spec/controllers/users/email_confirmations_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,12 @@
expect(flash[:error]).to eq t('errors.messages.confirmation_invalid_token')
end
end

describe 'Invalid email confirmation tokens' do
it 'rejects invalid parameters' do
get :create, params: { confirmation_token: { confirmation_token: 'abc' } }
expect(flash[:error]).to eq t('errors.messages.confirmation_invalid_token')
end
end
end
end