FIX: Improve checks for non-human users.

This commit is contained in:
Guo Xiang Tan
2017-03-14 14:33:06 +08:00
parent aeb169bd0e
commit 5943543ec3
8 changed files with 15 additions and 12 deletions

View File

@ -491,7 +491,7 @@ class UsersController < ApplicationController
RateLimiter.new(nil, "admin-login-hr-#{request.remote_ip}", 6, 1.hour).performed!
RateLimiter.new(nil, "admin-login-min-#{request.remote_ip}", 3, 1.minute).performed!
user = User.where(email: params[:email], admin: true).where.not(id: Discourse::SYSTEM_USER_ID).first
user = User.where(email: params[:email], admin: true).human_users.first
if user
email_token = user.email_tokens.create(email: user.email)
Jobs.enqueue(:critical_user_email, type: :admin_login, user_id: user.id, email_token: email_token.token)