From 96837c54cfea94a42542115ba3c300653553fd2d Mon Sep 17 00:00:00 2001 From: MAEDA Go Date: Sun, 8 Sep 2019 11:13:14 +0900 Subject: [PATCH] Add auth_source to the users API response. --- app/views/users/show.api.rsb | 5 +++++ test/integration/api_test/users_test.rb | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/app/views/users/show.api.rsb b/app/views/users/show.api.rsb index 1a3041db3..8ceda7ca9 100644 --- a/app/views/users/show.api.rsb +++ b/app/views/users/show.api.rsb @@ -10,6 +10,11 @@ api.user do api.api_key @user.api_key if User.current.admin? || (User.current == @user) api.status @user.status if User.current.admin? + api.auth_source do + api.id @user.auth_source.id + api.name @user.auth_source.name + end if User.current.admin? && @user.auth_source.present? + render_api_custom_values @user.visible_custom_field_values, api api.array :groups do |groups| diff --git a/test/integration/api_test/users_test.rb b/test/integration/api_test/users_test.rb index 54009a39f..7499c9099 100644 --- a/test/integration/api_test/users_test.rb +++ b/test/integration/api_test/users_test.rb @@ -133,6 +133,15 @@ class Redmine::ApiTest::UsersTest < Redmine::ApiTest::Base assert_select 'user admin', 0 end + test "GET /users/:id should return auth_source for administrators" do + user = User.find(2) + user.update(:auth_source_id => 1) + get '/users/2.xml', :headers => credentials('admin') + assert_response :success + assert_select 'user auth_source id', :text => user.auth_source.id.to_s + assert_select 'user auth_source name', :text => user.auth_source.name + end + test "POST /users.xml with valid parameters should create the user" do assert_difference('User.count') do post '/users.xml', -- 2.20.1 (Apple Git-117)