FIX: allow retry activation of account by username or password

This commit is contained in:
Sam
2014-09-25 17:42:48 +10:00
parent c4fb7dce23
commit 8f8ea735ee
4 changed files with 8 additions and 4 deletions

View File

@@ -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