Merge pull request #5314 from AntonKhorev/note-subscriptions-api

[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 15f3812674ab3bd520cf52e04ad94b302498ba82..75bfe6b107a2f01203b0cb1d0fc0bfe7a9faeae6 100644 (file)
--- a/app/controllers/api/permissions_controller.rb
+++ b/app/controllers/api/permissions_controller.rb
@@ -1,26 +1,25 @@
 module Api
   class PermissionsController < ApiController
 module Api
   class PermissionsController < ApiController

-    before_action :api_deny_access_handler
-

     authorize_resource :class => false
 
     authorize_resource :class => false
 

-    before_action :check_api_readable

     before_action :setup_user_auth
     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.
 
     # 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
     # * 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
                      else
                        []
                      end

+
+      respond_to do |format|
+        format.xml
+        format.json
+      end

     end
   end
 end
     end
   end
 end