Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-06 10:50:21 +08:00
Code Packages Activity Actions 9

use system user helper and constant when it's referred

Browse source
This commit is contained in:
Erick Guan 2014-12-18 18:21:06 +08:00
parent 9937af7ac4
commit ceca85c9eb
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/session_controller.rb
View file

@ -120,7 +120,7 @@ class SessionController < ApplicationController
RateLimiter.new(nil, "forgot-password-min-#{request.remote_ip}", 3, 1.minute).performed! RateLimiter.new(nil, "forgot-password-min-#{request.remote_ip}", 3, 1.minute).performed!
user = User.find_by_username_or_email(params[:login]) user = User.find_by_username_or_email(params[:login])
user_presence = user.present? && user.id != -1 user_presence = user.present? && user.id != Discourse::SYSTEM_USER_ID
if user_presence if user_presence
email_token = user.email_tokens.create(email: user.email) email_token = user.email_tokens.create(email: user.email)
Jobs.enqueue(:user_email, type: :forgot_password, user_id: user.id, email_token: email_token.token) Jobs.enqueue(:user_email, type: :forgot_password, user_id: user.id, email_token: email_token.token)

2
spec/controllers/session_controller_spec.rb
View file

@ -432,7 +432,7 @@ describe SessionController do
end end
context 'do nothing to system username' do context 'do nothing to system username' do
let(:user) { User.find(-1) } let(:user) { Discourse.system_user }
it 'generates no token for system username' do it 'generates no token for system username' do
lambda { xhr :post, :forgot_password, login: user.username}.should_not change(EmailToken, :count) lambda { xhr :post, :forgot_password, login: user.username}.should_not change(EmailToken, :count)