Merge remote-tracking branch 'upstream/pull/4822'

[rails.git] / app / controllers / api / permissions_controller.rb

diff --git a/app/controllers/api/permissions_controller.rb b/app/controllers/api/permissions_controller.rb
index b24aca776dcfef6afeb0d0c476aaaea6bd46d5b4..8c0c949dc2c71302f64b1611f2977961a71d7718 100644 (file)
--- a/app/controllers/api/permissions_controller.rb
+++ b/app/controllers/api/permissions_controller.rb
@@ -1,12 +1,11 @@
 module Api
-  class PermissionsController < ApplicationController
-    skip_before_action :verify_authenticity_token
-    before_action :api_deny_access_handler
+  class PermissionsController < ApiController
+    before_action :check_api_readable
 
     authorize_resource :class => false
 
-    before_action :check_api_readable
     before_action :setup_user_auth
+    before_action :set_request_formats
     around_action :api_call_handle_error, :api_call_timeout
 
     # External apps that use the api are able to query which permissions
@@ -15,13 +14,20 @@ module Api
     # * if authenticated via basic auth all permissions are granted, so the list will contain all permissions.
     # * unauthenticated users have no permissions, so the list will be empty.
     def show
-      @permissions = if current_token.present?
+      @permissions = if doorkeeper_token.present?
+                       doorkeeper_token.scopes.map { |s| :"allow_#{s}" }
+                     elsif current_token.present?
                        ClientApplication.all_permissions.select { |p| current_token.read_attribute(p) }
                      elsif current_user
                        ClientApplication.all_permissions
                      else
                        []
                      end
+
+      respond_to do |format|
+        format.xml
+        format.json
+      end
     end
   end
 end