separate ability and capability

[rails.git] / app / controllers / application_controller.rb

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 84adc1a32d287d4e34b4b0544f2f52efd72f8d0d..2be8c16371546e9fe39e7491b8e11a66536e54a4 100644 (file)
--- 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,21 @@ 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).merge(granted_capabily)
   end
 
-  def current_ability
-    @current_ability ||= Ability.new(current_user, current_token)
+  def granted_capabily
+    Capability.new(current_user, current_token)
+  end
+
+  def deny_access(exception)
+    if current_user
+      set_locale
+      report_error t("oauth.permissions.missing"), :forbidden
+    else
+      require_user
+    end
   end
 
   private