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

Merge spree/users_sessions_controller into spree/users_sessions from spree_auth_devise

Browse Source
This commit is contained in:
luisramos0
2019-07-07 22:06:18 +01:00
parent c8ac64566f
commit 92968c5efe
2 changed files with 5 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/spree/user_sessions_controller.rb
View File

@@ -12,19 +12,19 @@ class Spree::UserSessionsController < Devise::SessionsController
ssl_required :new, :create, :destroy, :update
ssl_allowed :login_bar
before_filter :set_checkout_redirect, only: :create
def create
authenticate_spree_user!
if spree_user_signed_in?
respond_to do |format|
format.html {
flash[:success] = Spree.t(:logged_in_succesfully)
flash[:success] = t('devise.success.logged_in_succesfully')
redirect_back_or_default(after_sign_in_path_for(spree_current_user))
}
format.js {
render :json => {:user => spree_current_user,
:ship_address => spree_current_user.ship_address,
:bill_address => spree_current_user.bill_address}.to_json
render json: { email: spree_current_user.login }, status: :ok
}
end
else
@@ -34,7 +34,7 @@ class Spree::UserSessionsController < Devise::SessionsController
render :new
}
format.js {
render :json => { error: t('devise.failure.invalid') }, status: :unprocessable_entity
render json: { message: t('devise.failure.invalid') }, status: :unauthorized
}
end
end

29
app/controllers/spree/user_sessions_controller_decorator.rb
View File

@@ -1,29 +0,0 @@
Spree::UserSessionsController.class_eval do
before_filter :set_checkout_redirect, only: :create
def create
authenticate_spree_user!
if spree_user_signed_in?
respond_to do |format|
format.html {
flash[:success] = t('devise.success.logged_in_succesfully')
redirect_back_or_default(after_sign_in_path_for(spree_current_user))
}
format.js {
render json: { email: spree_current_user.login }, status: :ok
}
end
else
respond_to do |format|
format.html {
flash.now[:error] = t('devise.failure.invalid')
render :new
}
format.js {
render json: { message: t('devise.failure.invalid') }, status: :unauthorized
}
end
end
end
end