lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-xx: Restructured email verification and password reset (#1444)

Browse Source 
* Restructured email verification and password reset

* Fixed issue with password reset

Co-authored-by: Jesus Federico <jesus@123it.ca>
This commit is contained in:
Ahmad Farhat
2020-04-29 17:56:46 -04:00
committed by GitHub
parent 8f3ba8a038
commit 28302107bd
10 changed files with 46 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/concerns/emailer.rb
View File

@ -20,11 +20,11 @@ module Emailer
extend ActiveSupport::Concern
# Sends account activation email.
def send_activation_email(user)
def send_activation_email(user, token)
begin
return unless Rails.configuration.enable_email_verification
UserMailer.verify_email(user, user_verification_link(user), @settings).deliver
UserMailer.verify_email(user, user_verification_link(token), @settings).deliver
rescue => e
logger.error "Support: Error in email delivery: #{e}"
flash[:alert] = I18n.t(params[:message], default: I18n.t("delivery_error"))
@ -34,11 +34,11 @@ module Emailer
end
# Sends password reset email.
def send_password_reset_email(user)
def send_password_reset_email(user, token)
begin
return unless Rails.configuration.enable_email_verification
UserMailer.password_reset(user, reset_link(user), @settings).deliver_now
UserMailer.password_reset(user, reset_link(token), @settings).deliver_now
rescue => e
logger.error "Support: Error in email delivery: #{e}"
flash[:alert] = I18n.t(params[:message], default: I18n.t("delivery_error"))
@ -124,8 +124,8 @@ module Emailer
private
# Returns the link the user needs to click to verify their account
def user_verification_link(user)
edit_account_activation_url(token: user.activation_token)
def user_verification_link(token)
edit_account_activation_url(token: token)
end
def admin_emails
@ -139,8 +139,8 @@ module Emailer
admins.collect(&:email).join(",")
end
def reset_link(user)
edit_password_reset_url(user.reset_token)
def reset_link(token)
edit_password_reset_url(token)
end
def invitation_link(token)