From 20af025c65dac642f664760a1428b2ab88920641 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 6 Jan 2021 11:30:32 -0600
Subject: [PATCH 1/2] AdminAPI: return user email

---
 lib/pleroma/web/admin_api/views/account_view.ex                 | 1 +
 test/pleroma/web/admin_api/controllers/user_controller_test.exs | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex
index 8bac24d3e..ebf90b91b 100644
--- a/lib/pleroma/web/admin_api/views/account_view.ex
+++ b/lib/pleroma/web/admin_api/views/account_view.ex
@@ -69,6 +69,7 @@ def render("show.json", %{user: user}) 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
index 5705306c7..67b0c578c 100644
--- 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 @@ defp user_response(user, attrs \\ %{}) do
     %{
       "deactivated" => user.deactivated,
       "id" => user.id,
+      "email" => user.email,
       "nickname" => user.nickname,
       "roles" => %{"admin" => false, "moderator" => false},
       "local" => user.local,

From 9f6fa5877faee2de0bbec27d434e04972ce13a96 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 6 Jan 2021 11:43:07 -0600
Subject: [PATCH 2/2] Add AdminAPI.AccountViewTest

---
 .../web/admin_api/views/account_view_test.exs    | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 test/pleroma/web/admin_api/views/account_view_test.exs

diff --git a/test/pleroma/web/admin_api/views/account_view_test.exs b/test/pleroma/web/admin_api/views/account_view_test.exs
new file mode 100644
index 000000000..f54214575
--- /dev/null
+++ 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