Browse Source

Include auth_source in /users API response if request includes auth_source (#23307).

git-svn-id: https://svn.redmine.org/redmine/trunk@22666 e93f8b46-1217-0410-a6f0-8f06a7374b81
pull/145/merge
Marius Balteanu 3 months ago
parent
commit
c1fa75386c
2 changed files with 24 additions and 0 deletions
  1. 5
    0
      app/views/users/index.api.rsb
  2. 19
    0
      test/integration/api_test/users_test.rb

+ 5
- 0
app/views/users/index.api.rsb View File

api.twofa_scheme user.twofa_scheme api.twofa_scheme user.twofa_scheme
api.status user.status api.status user.status


api.auth_source do
api.id user.auth_source.id
api.name user.auth_source.name
end if include_in_api_response?('auth_source') && user.auth_source.present?

render_api_custom_values user.visible_custom_field_values, api render_api_custom_values user.visible_custom_field_values, api
end end
end end

+ 19
- 0
test/integration/api_test/users_test.rb View File

assert_equal 0, json['users'].size assert_equal 0, json['users'].size
end end


test "GET /users.json with include=auth_source" do
user = User.find(2)
user.update(:auth_source_id => 1)
get '/users.json?include=auth_source', :headers => credentials('admin')

json = ActiveSupport::JSON.decode(response.body)
assert json.key?('users')

json['users'].each do | user_json |
if user_json['id'] == user.id
assert_kind_of Hash, user_json['auth_source']
assert_equal user.auth_source.id, user_json['auth_source']['id']
assert_equal user.auth_source.name, user_json['auth_source']['name']
else
assert_nil user_json['auth_source']
end
end
end

test "GET /users.json with short filters" do test "GET /users.json with short filters" do
get '/users.json', headers: credentials('admin'), params: { status: "1|3" } get '/users.json', headers: credentials('admin'), params: { status: "1|3" }
assert_response :success assert_response :success

Loading…
Cancel
Save