X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/19c2f6d485baf6ae5986a9eeaed412cb2e2039a1..b97e8d5427e5be6eb5c83eb4e634882acaa69d16:/app/controllers/api_controller.rb diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 511748d8d..df7cfe93b 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -16,6 +16,15 @@ class ApiController < ApplicationController end end + def current_ability + # Use capabilities from the oauth token if it exists and is a valid access token + if Authenticator.new(self, [:token]).allow? + ApiAbility.new(nil).merge(ApiCapability.new(current_token)) + else + ApiAbility.new(current_user) + end + end + def deny_access(_exception) if current_token set_locale @@ -32,7 +41,7 @@ class ApiController < ApplicationController def gpx_status status = database_status - status = :offline if status == :online && Settings.status == "gpx_offline" + status = "offline" if status == "online" && Settings.status == "gpx_offline" status end