From: Chris Flipse <cflipse@gmail.com>
Date: Sat, 9 Jun 2018 20:20:21 +0000 (-0400)
Subject: use a controller method to handle cancan denials
X-Git-Tag: live~2824^2~15^2~8
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/6b44a1976cf07ba50ba8aed8b34434e69a45e62d?ds=inline

use a controller method to handle cancan denials

This will let controllers override for specific circumstances
---

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 84adc1a32..54d5835bb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -4,6 +4,8 @@ class ApplicationController < ActionController::Base
 
   protect_from_forgery :with => :exception
 
+  rescue_from CanCan::AccessDenied, :with => :deny_access
+
   before_action :fetch_body
   around_action :better_errors_allow_inline, :if => proc { Rails.env.development? }
 
@@ -468,13 +470,17 @@ class ApplicationController < ActionController::Base
     raise
   end
 
-  rescue_from CanCan::AccessDenied do |exception|
-    raise "Access denied on #{exception.action} #{exception.subject.inspect}"
-    # ...
+  def current_ability
+    Ability.new(current_user, current_token)
   end
 
-  def current_ability
-    @current_ability ||= Ability.new(current_user, current_token)
+  def deny_access(exception)
+    if current_user
+      raise "Access denied on #{exception.action} #{exception.subject.inspect}"
+      # ...
+    else
+      require_user
+    end
   end
 
   private