From aee533dc3990e2c19a8812c42852af76cbf0e931 Mon Sep 17 00:00:00 2001 From: Birkhoff Lee Date: Thu, 6 Oct 2022 21:40:00 +0800 Subject: [PATCH 1/2] fix(confirmation): make strong params match Fixes #1558 --- app/controllers/devise_token_auth/confirmations_controller.rb | 2 +- app/views/devise/mailer/confirmation_instructions.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/devise_token_auth/confirmations_controller.rb b/app/controllers/devise_token_auth/confirmations_controller.rb index 0acc02b29..baab1fdd9 100644 --- a/app/controllers/devise_token_auth/confirmations_controller.rb +++ b/app/controllers/devise_token_auth/confirmations_controller.rb @@ -71,7 +71,7 @@ def render_not_found_error private def resource_params - params.permit(:email, :confirmation_token, :config_name) + params.permit(:confirmation_token, :config_name, :redirect_url) end # give redirect value from params priority or fall back to default value if provided diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb index dba08dc40..1df121d5b 100644 --- a/app/views/devise/mailer/confirmation_instructions.html.erb +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -2,4 +2,4 @@

<%= t '.confirm_link_msg' %>

-

<%= link_to t('.confirm_account_link'), confirmation_url(@resource, {confirmation_token: @token, config: message['client-config'].to_s, redirect_url: message['redirect-url']}).html_safe %>

+

<%= link_to t('.confirm_account_link'), confirmation_url(@resource, {confirmation_token: @token, config_name: message['client-config'].to_s, redirect_url: message['redirect-url']}).html_safe %>

From 8a12ace41e67436d20c5e8f6019daeba768211f0 Mon Sep 17 00:00:00 2001 From: Birkhoff Lee Date: Thu, 6 Oct 2022 21:44:37 +0800 Subject: [PATCH 2/2] fix(confirmation): make strong params match Fixes #1558 --- app/controllers/devise_token_auth/confirmations_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/devise_token_auth/confirmations_controller.rb b/app/controllers/devise_token_auth/confirmations_controller.rb index baab1fdd9..9e35b883f 100644 --- a/app/controllers/devise_token_auth/confirmations_controller.rb +++ b/app/controllers/devise_token_auth/confirmations_controller.rb @@ -71,7 +71,7 @@ def render_not_found_error private def resource_params - params.permit(:confirmation_token, :config_name, :redirect_url) + params.permit(:email, :confirmation_token, :config_name, :redirect_url) end # give redirect value from params priority or fall back to default value if provided