Merge pull request #5151 from AntonKhorev/no-history-and-export-buttons

[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 9b168e04b568e5c1f880f0f2a035a11f1dc74c44..75bfe6b107a2f01203b0cb1d0fc0bfe7a9faeae6 100644 (file)
--- a/app/controllers/api/permissions_controller.rb
+++ b/app/controllers/api/permissions_controller.rb
@@ -2,23 +2,24 @@ module Api
   class PermissionsController < ApiController
     authorize_resource :class => false
 
-    before_action :check_api_readable
     before_action :setup_user_auth
-    around_action :api_call_handle_error, :api_call_timeout
+    before_action :set_request_formats
 
     # External apps that use the api are able to query which permissions
     # they have. This currently returns a list of permissions granted to the current user:
     # * if authenticated via OAuth, this list will contain all permissions granted by the user to the access_token.
-    # * 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?
-                       ClientApplication.all_permissions.select { |p| current_token.read_attribute(p) }
-                     elsif current_user
-                       ClientApplication.all_permissions
+      @permissions = if doorkeeper_token.present?
+                       doorkeeper_token.scopes.map { |s| :"allow_#{s}" }
                      else
                        []
                      end
+
+      respond_to do |format|
+        format.xml
+        format.json
+      end
     end
   end
 end