X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/73214da35de30b3466cf8d0ab751955ec9292ec4..b0288b83bb437bbfc0deb325cca142066dc9848b:/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 b24aca776..73b84f8ed 100644 --- a/app/controllers/api/permissions_controller.rb +++ b/app/controllers/api/permissions_controller.rb @@ -1,8 +1,5 @@ module Api - class PermissionsController < ApplicationController - skip_before_action :verify_authenticity_token - before_action :api_deny_access_handler - + class PermissionsController < ApiController authorize_resource :class => false before_action :check_api_readable @@ -15,7 +12,9 @@ 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