techhub/mastodon
2
0
Fork 0
Code Activity

Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368)

Browse Source
This commit is contained in:
Claire
2023-10-25 23:33:44 +02:00
committed by GitHub
parent 9a3d047f3e
commit 49b8433c56
5 changed files with 49 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,6 +39,12 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
show
end
def redirect_to_app?
truthy_param?(:redirect_to_app)
end
helper_method :redirect_to_app?
private
def require_captcha_if_needed!
@@ -82,7 +88,7 @@ class Auth::ConfirmationsController < Devise::ConfirmationsController
end
def after_confirmation_path_for(_resource_name, user)
if user.created_by_application && truthy_param?(:redirect_to_app)
if user.created_by_application && redirect_to_app?
user.created_by_application.confirmation_redirect_uri
elsif user_signed_in?
web_url('start')