X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/7b9cff04eb463c666b8126ebc6c4dfcc00a536c0..6f70a514652050bde05301a4715be8769f213ac6:/services/api/lib/current_api_client.rb diff --git a/services/api/lib/current_api_client.rb b/services/api/lib/current_api_client.rb index 0803d5464d..f851c588c7 100644 --- a/services/api/lib/current_api_client.rb +++ b/services/api/lib/current_api_client.rb @@ -29,19 +29,6 @@ module CurrentApiClient Thread.current[:api_client_ip_address] end - # Is the current API client authorization scoped for the request? - def current_api_client_auth_has_scope(req_s) - (current_api_client_authorization.andand.scopes || []).select { |scope| - if scope == 'all' - true - elsif scope.end_with? '/' - req_s.start_with? scope - else - req_s == scope - end - }.any? - end - def system_user_uuid [Server::Application.config.uuid_prefix, User.uuid_prefix, @@ -57,7 +44,9 @@ module CurrentApiClient def system_user if not $system_user real_current_user = Thread.current[:user] - Thread.current[:user] = User.new(is_admin: true, is_active: true) + Thread.current[:user] = User.new(is_admin: true, + is_active: true, + uuid: system_user_uuid) $system_user = User.where('uuid=?', system_user_uuid).first if !$system_user $system_user = User.new(uuid: system_user_uuid,