mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
disable sending email or show presence when forgot system user password
This commit is contained in:
@@ -120,14 +120,15 @@ 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])
|
||||||
if user.present?
|
user_presence = user.present? && user.id != -1
|
||||||
|
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)
|
||||||
end
|
end
|
||||||
|
|
||||||
json = { result: "ok" }
|
json = { result: "ok" }
|
||||||
unless SiteSetting.forgot_password_strict
|
unless SiteSetting.forgot_password_strict
|
||||||
json[:user_found] = user.present?
|
json[:user_found] = user_presence
|
||||||
end
|
end
|
||||||
|
|
||||||
render json: json
|
render json: json
|
||||||
|
|||||||
@@ -431,6 +431,18 @@ describe SessionController do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'do nothing to system username' do
|
||||||
|
let(:user) { User.find(-1) }
|
||||||
|
|
||||||
|
it 'generates no token for system username' do
|
||||||
|
lambda { xhr :post, :forgot_password, login: user.username}.should_not change(EmailToken, :count)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'enqueues no email' do
|
||||||
|
Jobs.expects(:enqueue).never
|
||||||
|
xhr :post, :forgot_password, login: user.username
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '.current' do
|
describe '.current' do
|
||||||
|
|||||||
Reference in New Issue
Block a user