github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-30 05:38:13 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Store user's id instead for sending activation email.

Browse Source 
* Email and username are both allowed to be used for logging in.
  Therefore, it is easier to just store the user's id rather than
  to store the username and email in the session.
This commit is contained in:
Guo Xiang Tan
2017-03-13 20:20:25 +08:00
parent 7ebfa3c901
commit 9364d8ce71
3 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spec/controllers/users_controller_spec.rb
View File

@ -1406,7 +1406,7 @@ describe UsersController do
context 'for an activated account' do
it 'fails' do
active_user = Fabricate(:user, active: true)
session[SessionController::ACTIVATE_USER_KEY] = active_user.username
session[SessionController::ACTIVATE_USER_KEY] = active_user.id
xhr :post, :send_activation_email, username: active_user.username
expect(response.status).to eq(409)
@ -1419,9 +1419,18 @@ describe UsersController do
end
end
describe 'when user does not have a valid session' do
it 'should not be valid' do
user = Fabricate(:user)
xhr :post, :send_activation_email, username: user.username
expect(response.status).to eq(403)
end
end
context 'with a valid email_token' do
it 'should send the activation email' do
session["activate_user"] = user.username
session[SessionController::ACTIVATE_USER_KEY] = user.id
Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
xhr :post, :send_activation_email, username: user.username
@ -1437,13 +1446,13 @@ describe UsersController do
it 'should generate a new token' do
expect {
session["activate_user"] = user.username
session[SessionController::ACTIVATE_USER_KEY] = user.id
xhr :post, :send_activation_email, username: user.username
}.to change{ user.email_tokens(true).count }.by(1)
end
it 'should send an email' do
session["activate_user"] = user.username
session[SessionController::ACTIVATE_USER_KEY] = user.id
Jobs.expects(:enqueue).with(:critical_user_email, has_entries(type: :signup))
xhr :post, :send_activation_email, username: user.username