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 d7fb92ae6aebc9531afd7b6a2a159a8812a3b3f0..75bfe6b107a2f01203b0cb1d0fc0bfe7a9faeae6 100644 (file)
--- a/app/controllers/api/permissions_controller.rb
+++ b/app/controllers/api/permissions_controller.rb
@@ -4,18 +4,14 @@ module Api
 
     before_action :setup_user_auth
     before_action :set_request_formats
 
     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
     # 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
       @permissions = if doorkeeper_token.present?
                        doorkeeper_token.scopes.map { |s| :"allow_#{s}" }
     # * unauthenticated users have no permissions, so the list will be empty.
     def show
       @permissions = if doorkeeper_token.present?
                        doorkeeper_token.scopes.map { |s| :"allow_#{s}" }

-                     elsif current_user
-                       Oauth.scopes.map { |s| :"allow_#{s.name}" }

                      else
                        []
                      end
                      else
                        []
                      end