mirror of
https://github.com/discourse/discourse.git
synced 2025-02-25 18:55:32 -06:00
FIX: allow retry activation of account by username or password
This commit is contained in:
@@ -325,7 +325,11 @@ class UsersController < ApplicationController
|
||||
end
|
||||
|
||||
def send_activation_email
|
||||
@user = fetch_user_from_params(include_inactive: true)
|
||||
|
||||
RateLimiter.new(nil, "activate-hr-#{request.remote_ip}", 30, 1.hour).performed!
|
||||
RateLimiter.new(nil, "activate-min-#{request.remote_ip}", 6, 1.minute).performed!
|
||||
|
||||
@user = User.find_by_username_or_email(params[:username].to_s)
|
||||
@email_token = @user.email_tokens.unconfirmed.active.first
|
||||
enqueue_activation_email if @user
|
||||
render nothing: true
|
||||
|
||||
Reference in New Issue
Block a user