summaryrefslogtreecommitdiffstats
path: root/app/views/users
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2020-12-23 02:58:49 +0000
committerGo MAEDA <maeda@farend.jp>2020-12-23 02:58:49 +0000
commit5eb4b6af7948d1690942ba2f5fb8d0ffd90257be (patch)
tree9c02ea62dbb985e332bac187cfa87c6e4b2051fd /app/views/users
parent843f13f7e207b6c0dffeb582db47176fd9fc1fa9 (diff)
downloadredmine-5eb4b6af7948d1690942ba2f5fb8d0ffd90257be.tar.gz
redmine-5eb4b6af7948d1690942ba2f5fb8d0ffd90257be.zip
Include two-factor authentication scheme in users API response (#34242).
Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@20686 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/users')
-rw-r--r--app/views/users/index.api.rsb1
-rw-r--r--app/views/users/show.api.rsb1
2 files changed, 2 insertions, 0 deletions
diff --git a/app/views/users/index.api.rsb b/app/views/users/index.api.rsb
index 66b104f46..4b51ba47a 100644
--- a/app/views/users/index.api.rsb
+++ b/app/views/users/index.api.rsb
@@ -11,6 +11,7 @@ api.array :users, api_meta(:total_count => @user_count, :offset => @offset, :lim
api.updated_on user.updated_on
api.last_login_on user.last_login_on
api.passwd_changed_on user.passwd_changed_on
+ api.twofa_scheme user.twofa_scheme
render_api_custom_values user.visible_custom_field_values, api
end
diff --git a/app/views/users/show.api.rsb b/app/views/users/show.api.rsb
index 3bc77e3be..5fe3d5b1c 100644
--- a/app/views/users/show.api.rsb
+++ b/app/views/users/show.api.rsb
@@ -9,6 +9,7 @@ api.user do
api.updated_on @user.updated_on
api.last_login_on @user.last_login_on
api.passwd_changed_on @user.passwd_changed_on
+ api.twofa_scheme @user.twofa_scheme
api.api_key @user.api_key if User.current.admin? || (User.current == @user)
api.status @user.status if User.current.admin?