Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use new access denied extension point. #12

Merged
merged 1 commit into from
Jul 16, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 6 additions & 21 deletions lib/controllers/backend/spree/admin/admin_controller_decorator.rb
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
Spree::Admin::BaseController.class_eval do

# Redirect as appropriate when an access request fails. The default action is to redirect to the login screen.
# Override this method in your controllers if you want to have special behavior in case the user is not authorized
# to access the requested action. For example, a popup window might simply close itself.
def unauthorized
if try_spree_current_user
flash[:error] = Spree.t(:authorization_failure)
redirect_to spree.admin_unauthorized_path
else
store_location
redirect_to spree.admin_login_path
end
end

protected

def model_class
const_name = controller_name.classify
if Spree.const_defined?(const_name, false)
return "Spree::#{const_name}".constantize
end
nil
def model_class
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i'm still curious why this is here as opposed to in core, though that's not central to what you're doing here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neither am I. Wanted to limit the number of changes in this pull-request so I didn't spend any time looking into whether this is even necessary.

const_name = controller_name.classify
if Spree.const_defined?(const_name, false)
return "Spree::#{const_name}".constantize
end

nil
end
end

This file was deleted.

20 changes: 20 additions & 0 deletions lib/spree/auth/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,26 @@ def self.activate
end
end
ApplicationController.send :include, Spree::AuthenticationHelpers

Spree::BaseController.unauthorized_redirect = -> do
if try_spree_current_user
flash[:error] = Spree.t(:authorization_failure)
redirect_to spree.unauthorized_path
else
store_location
redirect_to spree.login_path
end
end

Spree::Admin::BaseController.unauthorized_redirect = -> do
if try_spree_current_user
flash[:error] = Spree.t(:authorization_failure)
redirect_to spree.admin_unauthorized_path
else
store_location
redirect_to spree.admin_login_path
end
end
end

def self.backend_available?
Expand Down