fix and improve ability coverage to account for tokens

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

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 394b04d58d5a52b8656bca5db03e49384f425b2a..b6a2467a4149d01bbfebe932d128f0331ed2c393 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,9 +1,11 @@
 class ApplicationController < ActionController::Base
   include SessionPersistence
 class ApplicationController < ActionController::Base
   include SessionPersistence

-  check_authorization
+  # check_authorization

 
   protect_from_forgery :with => :exception
 
 
   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? }
 
   before_action :fetch_body
   around_action :better_errors_allow_inline, :if => proc { Rails.env.development? }
 


@@ -468,9 +470,17 @@ class ApplicationController < ActionController::Base
     raise
   end
 
     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 deny_access(exception)
+    if current_user
+      set_locale
+      report_error t("oauth.permissions.missing"), :forbidden
+    else
+      require_user
+    end

   end
 
   private
   end
 
   private