From 2bc0f0cfcf7b201df2e55afb5c1360f3d591782a Mon Sep 17 00:00:00 2001 From: Alex Buijs Date: Wed, 31 Jul 2019 16:47:58 +0200 Subject: Add ConfirmEmailWarning concern --- app/controllers/concerns/confirm_email_warning.rb | 25 +++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 app/controllers/concerns/confirm_email_warning.rb (limited to 'app/controllers/concerns') diff --git a/app/controllers/concerns/confirm_email_warning.rb b/app/controllers/concerns/confirm_email_warning.rb new file mode 100644 index 00000000000..8e2d08c9193 --- /dev/null +++ b/app/controllers/concerns/confirm_email_warning.rb @@ -0,0 +1,25 @@ +# frozen_string_literal: true + +module ConfirmEmailWarning + extend ActiveSupport::Concern + + included do + before_action :set_confirm_warning, if: -> { Feature.enabled?(:soft_email_confirmation) } + end + + protected + + def set_confirm_warning + return if peek_request? || json_request? || !request.get? + return unless current_user + return if current_user.confirmed? + + email = current_user.unconfirmed_email || current_user.email + + flash.now[:warning] = _("Please check your email (%{email}) to verify that you own this address. Didn't receive it? %{resend_link}. Wrong email address? %{update_link}.").html_safe % { + email: email, + resend_link: view_context.link_to(_('Resend it'), user_confirmation_path(user: { email: email }), method: :post), + update_link: view_context.link_to(_('Update it'), profile_path) + } + end +end -- cgit v1.2.1 From 54ddc018ac71f0ec7379c8528144bb9192ced510 Mon Sep 17 00:00:00 2001 From: Alex Buijs Date: Mon, 12 Aug 2019 17:40:24 +0200 Subject: Incorporate feedback fixes --- app/controllers/concerns/confirm_email_warning.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/controllers/concerns') diff --git a/app/controllers/concerns/confirm_email_warning.rb b/app/controllers/concerns/confirm_email_warning.rb index 8e2d08c9193..5a4b5897a4f 100644 --- a/app/controllers/concerns/confirm_email_warning.rb +++ b/app/controllers/concerns/confirm_email_warning.rb @@ -10,9 +10,9 @@ module ConfirmEmailWarning protected def set_confirm_warning - return if peek_request? || json_request? || !request.get? return unless current_user return if current_user.confirmed? + return if peek_request? || json_request? || !request.get? email = current_user.unconfirmed_email || current_user.email -- cgit v1.2.1