raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-01 02:03:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extract json render from :user_confirmed? method

Browse Source
This commit is contained in:
Matt-Yorkley
2018-04-21 13:37:48 +01:00
committed by Rob Harrington
parent 1c57f0f241
commit a08b095547
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/user_passwords_controller.rb
View File

@@ -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