From a08b0955476794f4e575cc65138489834d964a80 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley Date: Sat, 21 Apr 2018 13:37:48 +0100 Subject: [PATCH] Extract json render from :user_confirmed? method --- app/controllers/user_passwords_controller.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/user_passwords_controller.rb b/app/controllers/user_passwords_controller.rb index 240837655e..e6b7610a13 100644 --- a/app/controllers/user_passwords_controller.rb +++ b/app/controllers/user_passwords_controller.rb @@ -4,7 +4,7 @@ class UserPasswordsController < Spree::UserPasswordsController before_filter :set_admin_redirect, only: :edit def create - return if user_unconfirmed? + render_unconfirmed_response && return if user_unconfirmed? self.resource = resource_class.send_reset_password_instructions(params[resource_name]) @@ -29,12 +29,12 @@ class UserPasswordsController < Spree::UserPasswordsController session["spree_user_return_to"] = params[:return_to] if params[:return_to] end + def render_unconfirmed_response + render json: { error: t('email_unconfirmed') }, status: :unauthorized + end + def user_unconfirmed? user = Spree::User.find_by_email(params[:spree_user][:email]) - if user && !user.confirmed? - render json: { error: t('email_unconfirmed') }, status: :unauthorized - end - user && !user.confirmed? end end