moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'adminapi-user-email' into 'develop' 

AdminAPI: return user email

See merge request pleroma/pleroma!3240
This commit is contained in:
lain 2021-01-07 10:08:02 +00:00
parent f1ca2ac64b 9f6fa5877f
commit 4d56aca904
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/pleroma/web/admin_api/views/account_view.ex
View File

@ -69,6 +69,7 @@ def render("show.json", %{user: user}) do
%{ %{
"id" => user.id, "id" => user.id,
"email" => user.email,
"avatar" => avatar, "avatar" => avatar,
"nickname" => user.nickname, "nickname" => user.nickname,
"display_name" => display_name, "display_name" => display_name,

1
test/pleroma/web/admin_api/controllers/user_controller_test.exs
View File

@ -953,6 +953,7 @@ defp user_response(user, attrs \\ %{}) do
%{ %{
"deactivated" => user.deactivated, "deactivated" => user.deactivated,
"id" => user.id, "id" => user.id,
"email" => user.email,
"nickname" => user.nickname, "nickname" => user.nickname,
"roles" => %{"admin" => false, "moderator" => false}, "roles" => %{"admin" => false, "moderator" => false},
"local" => user.local, "local" => user.local,

16
test/pleroma/web/admin_api/views/account_view_test.exs Normal file
View File

@ -0,0 +1,16 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.AccountViewTest do
use Pleroma.DataCase, async: true
import Pleroma.Factory
alias Pleroma.Web.AdminAPI.AccountView
describe "show.json" do
test "renders the user's email" do
user = insert(:user, email: "yolo@yolofam.tld")
assert %{"email" => "yolo@yolofam.tld"} = AccountView.render("show.json", %{user: user})
end
end
end