X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/90360df6d76627d29eeaee7f1d1c2819e5d206b2..563871c5a9a8140522b0c569df5c91a38528c8ce:/app/controllers/api/permissions_controller.rb?ds=sidebyside

diff --git a/app/controllers/api/permissions_controller.rb b/app/controllers/api/permissions_controller.rb
index 73b84f8ed..d7fb92ae6 100644
--- a/app/controllers/api/permissions_controller.rb
+++ b/app/controllers/api/permissions_controller.rb
@@ -2,8 +2,8 @@ module Api
   class PermissionsController < ApiController
     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
@@ -14,13 +14,16 @@ module Api
     def show
       @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
+                       Oauth.scopes.map { |s| :"allow_#{s.name}" }
                      else
                        []
                      end
+
+      respond_to do |format|
+        format.xml
+        format.json
+      end
     end
   end
 end