X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/fc128bc6497aa266f925e2aa4821bde6fce9aade..87647b5d3d72ae0c291fcdf1ee3b4a46b3af91c0:/services/api/app/controllers/application_controller.rb diff --git a/services/api/app/controllers/application_controller.rb b/services/api/app/controllers/application_controller.rb index 9826cf2f90..c94ce89395 100644 --- a/services/api/app/controllers/application_controller.rb +++ b/services/api/app/controllers/application_controller.rb @@ -345,7 +345,7 @@ class ApplicationController < ActionController::Base .all end @read_auths.select! { |auth| auth.scopes_allow_request? request } - @read_users = @read_auths.map { |auth| auth.user }.uniq + @read_users = @read_auths.map(&:user).uniq end def require_login @@ -365,7 +365,7 @@ class ApplicationController < ActionController::Base end def require_auth_scope - if @read_auths.empty? + unless current_user && @read_auths.any? { |auth| auth.user.andand.uuid == current_user.uuid } if require_login != false send_error("Forbidden", status: 403) end @@ -402,7 +402,7 @@ class ApplicationController < ActionController::Base def set_cors_headers response.headers['Access-Control-Allow-Origin'] = '*' response.headers['Access-Control-Allow-Methods'] = 'GET, HEAD, PUT, POST, DELETE' - response.headers['Access-Control-Allow-Headers'] = 'Authorization' + response.headers['Access-Control-Allow-Headers'] = 'Authorization, Content-Type' response.headers['Access-Control-Max-Age'] = '86486400' end