diff options
author | Reverite <github@reverite.sh> | 2019-09-07 13:03:02 -0700 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-09-07 13:03:02 -0700 |
commit | 2486f5f825ae861cdf97529f64dc4e658ddab279 (patch) | |
tree | eebbd191c621baa43a93b26d97d4766cf7ebf9cd /app/controllers/auth/confirmations_controller.rb | |
parent | 54bf56d9e019e29c1509a2c5a0f23e4f1df65c90 (diff) | |
parent | 286bf110c3e69042049968440f1eb99372a7e0e6 (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/auth/confirmations_controller.rb')
-rw-r--r-- | app/controllers/auth/confirmations_controller.rb | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/app/controllers/auth/confirmations_controller.rb b/app/controllers/auth/confirmations_controller.rb index 1d6e4ec19..4e89446c7 100644 --- a/app/controllers/auth/confirmations_controller.rb +++ b/app/controllers/auth/confirmations_controller.rb @@ -5,19 +5,42 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController before_action :set_body_classes before_action :set_pack + before_action :require_unconfirmed! skip_before_action :require_functional! + def new + super + + resource.email = current_user.unconfirmed_email || current_user.email if user_signed_in? + end + private def set_pack use_pack 'auth' end + def require_unconfirmed! + redirect_to edit_user_registration_path if user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank? + end + def set_body_classes @body_classes = 'lighter' end + def after_resending_confirmation_instructions_path_for(_resource_name) + if user_signed_in? + if current_user.confirmed? && current_user.approved? + edit_user_registration_path + else + auth_setup_path + end + else + new_user_session_path + end + end + def after_confirmation_path_for(_resource_name, user) if user.created_by_application && truthy_param?(:redirect_to_app) user.created_by_application.redirect_uri |