Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #780 from jroes/fix-778 

Strip whitespace when changing e-mail addresses
This commit is contained in:
Jeff Atwood 2013-04-28 02:03:30 -07:00
parent a6d2c9db03 057b4768e6
commit 9e3b70c20e
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -265,7 +265,7 @@ class UsersController < ApplicationController
requires_parameter(:email) requires_parameter(:email)
user = fetch_user_from_params user = fetch_user_from_params
guardian.ensure_can_edit!(user) guardian.ensure_can_edit!(user)
lower_email = Email.downcase(params[:email]) lower_email = Email.downcase(params[:email]).strip
# Raise an error if the email is already in use # Raise an error if the email is already in use
if User.where("email = ?", lower_email).exists? if User.where("email = ?", lower_email).exists?

4
spec/controllers/users_controller_spec.rb
View File

@ -192,6 +192,10 @@ describe UsersController do
it 'raises an error' do it 'raises an error' do
lambda { xhr :put, :change_email, username: user.username, email: other_user.email }.should raise_error(Discourse::InvalidParameters) lambda { xhr :put, :change_email, username: user.username, email: other_user.email }.should raise_error(Discourse::InvalidParameters)
end end
it 'raises an error if there is whitespace too' do
lambda { xhr :put, :change_email, username: user.username, email: other_user.email + ' ' }.should raise_error(Discourse::InvalidParameters)
end
end end
context 'success' do context 'success' do