random-mirrors
/
gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'fix/confirmations' of https://code.gab.com/gab/social/gab-social into develop

This commit is contained in:
Fosco Marotto 2021-02-19 22:58:23 -05:00
parent 285cccdb83 58a8a17bfe
commit 1a7c34724e
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/controllers/auth/confirmations_controller.rb
View File

@ -4,18 +4,16 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
layout 'auth' layout 'auth'
before_action :set_body_classes before_action :set_body_classes
before_action :require_unconfirmed!
before_action :set_user, only: [:finish_signup] before_action :set_user, only: [:finish_signup]
def require_unconfirmed!
redirect_to edit_user_registration_path if user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank?
end
def finish_signup def finish_signup
return unless request.patch? && params[:user] return unless request.patch? && params[:user]
@user.email = current_user.unconfirmed_email || current_user.email if user_signed_in?
if @user.update(user_params)
@user.skip_reconfirmation!
bypass_sign_in(@user)
redirect_to root_path, notice: I18n.t('devise.confirmations.send_instructions')
else
@show_errors = true
end
end end
private private