pleroma

commit: 4d56aca9040f87708e38a050071aa9d3dc977c45
parent f1ca2ac64bf5a308401f3155360e94a058e99e4e
Author: lain <lain@soykaf.club>
Date:   Thu,  7 Jan 2021 10:08:02 +0000

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

AdminAPI: return user email

See merge request pleroma/pleroma!3240
Diffstat:
M
lib/pleroma/web/admin_api/views/account_view.ex
1
+
M
test/pleroma/web/admin_api/controllers/user_controller_test.exs
1
+
A
test/pleroma/web/admin_api/views/account_view_test.exs
16
++++++++++++++++

3 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex
@@ -69,6 +69,7 @@ defmodule Pleroma.Web.AdminAPI.AccountView do
 
     %{
       "id" => user.id,
+      "email" => user.email,
       "avatar" => avatar,
       "nickname" => user.nickname,
       "display_name" => display_name,
diff --git a/test/pleroma/web/admin_api/controllers/user_controller_test.exs b/test/pleroma/web/admin_api/controllers/user_controller_test.exs
@@ -953,6 +953,7 @@ defmodule Pleroma.Web.AdminAPI.UserControllerTest do
     %{
       "deactivated" => user.deactivated,
       "id" => user.id,
+      "email" => user.email,
       "nickname" => user.nickname,
       "roles" => %{"admin" => false, "moderator" => false},
       "local" => user.local,
diff --git a/test/pleroma/web/admin_api/views/account_view_test.exs b/test/pleroma/web/admin_api/views/account_view_test.exs
@@ -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