Merge branch 'fix/1825-admin-api-error-codes' into 'develop'

Proper error codes for error in adminFE

Closes #1825

See merge request pleroma/pleroma!2665

docs/API/admin_api.md

@@ -488,35 +488,39 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
 
 ### Change the user's email, password, display and settings-related fields
 
-- Params:
+* Params:
-  - `email`
+  * `email`
-  - `password`
+  * `password`
-  - `name`
+  * `name`
-  - `bio`
+  * `bio`
-  - `avatar`
+  * `avatar`
-  - `locked`
+  * `locked`
-  - `no_rich_text`
+  * `no_rich_text`
-  - `default_scope`
+  * `default_scope`
-  - `banner`
+  * `banner`
-  - `hide_follows`
+  * `hide_follows`
-  - `hide_followers`
+  * `hide_followers`
-  - `hide_followers_count`
+  * `hide_followers_count`
-  - `hide_follows_count`
+  * `hide_follows_count`
-  - `hide_favorites`
+  * `hide_favorites`
-  - `allow_following_move`
+  * `allow_following_move`
-  - `background`
+  * `background`
-  - `show_role`
+  * `show_role`
-  - `skip_thread_containment`
+  * `skip_thread_containment`
-  - `fields`
+  * `fields`
-  - `discoverable`
+  * `discoverable`
-  - `actor_type`
+  * `actor_type`
 
-- Response:
+* Responses:
+
+Status: 200
 
 ```json
 {"status": "success"}
 ```
 
+Status: 400
+
 ```json
 {"errors":
   {"actor_type": "is invalid"},
@@ -525,8 +529,10 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
  }
 ```
 
+Status: 404
+
 ```json
-{"error": "Unable to update user."}
+{"error": "Not found"}
 ```
 
 ## `GET /api/pleroma/admin/reports`

lib/pleroma/web/admin_api/controllers/admin_api_controller.ex

@@ -111,8 +111,7 @@ def user_delete(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames})
       action: "delete"
     })
 
-    conn
+    json(conn, nicknames)
-    |> json(nicknames)
   end
 
   def user_follow(%{assigns: %{user: admin}} = conn, %{
@@ -131,8 +130,7 @@ def user_follow(%{assigns: %{user: admin}} = conn, %{
       })
     end
 
-    conn
+    json(conn, "ok")
-    |> json("ok")
   end
 
   def user_unfollow(%{assigns: %{user: admin}} = conn, %{
@@ -151,8 +149,7 @@ def user_unfollow(%{assigns: %{user: admin}} = conn, %{
       })
     end
 
-    conn
+    json(conn, "ok")
-    |> json("ok")
   end
 
   def users_create(%{assigns: %{user: admin}} = conn, %{"users" => users}) do
@@ -191,8 +188,7 @@ def users_create(%{assigns: %{user: admin}} = conn, %{"users" => users}) do
           action: "create"
         })
 
-        conn
+        json(conn, res)
-        |> json(res)
 
       {:error, id, changeset, _} ->
         res =
@@ -363,8 +359,8 @@ defp maybe_parse_filters(filters) do
     filters
     |> String.split(",")
     |> Enum.filter(&Enum.member?(@filters, &1))
-    |> Enum.map(&String.to_atom(&1))
+    |> Enum.map(&String.to_atom/1)
-    |> Enum.into(%{}, &{&1, true})
+    |> Map.new(&{&1, true})
   end
 
   def right_add_multiple(%{assigns: %{user: admin}} = conn, %{
@@ -568,10 +564,10 @@ def update_user_credentials(
       {:error, changeset} ->
         errors = Map.new(changeset.errors, fn {key, {error, _}} -> {key, error} end)
 
-        json(conn, %{errors: errors})
+        {:errors, errors}
 
       _ ->
-        json(conn, %{error: "Unable to update user."})
+        {:error, :not_found}
     end
   end
 
@@ -616,7 +612,7 @@ defp configurable_from_database do
   def reload_emoji(conn, _params) do
     Pleroma.Emoji.reload()
 
-    conn |> json("ok")
+    json(conn, "ok")
   end
 
   def confirm_email(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames}) do
@@ -630,7 +626,7 @@ def confirm_email(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames}
       action: "confirm_email"
     })
 
-    conn |> json("")
+    json(conn, "")
   end
 
   def resend_confirmation_email(%{assigns: %{user: admin}} = conn, %{"nicknames" => nicknames}) do
@@ -644,14 +640,13 @@ def resend_confirmation_email(%{assigns: %{user: admin}} = conn, %{"nicknames" =
       action: "resend_confirmation_email"
     })
 
-    conn |> json("")
+    json(conn, "")
   end
 
   def stats(conn, _) do
     count = Stats.get_status_visibility_count()
 
-    conn
+    json(conn, %{"status_visibility" => count})
-    |> json(%{"status_visibility" => count})
   end
 
   defp page_params(params) do

lib/pleroma/web/admin_api/controllers/fallback_controller.ex

@@ -17,6 +17,12 @@ def call(conn, {:error, reason}) do
     |> json(%{error: reason})
   end
 
+  def call(conn, {:errors, errors}) do
+    conn
+    |> put_status(:bad_request)
+    |> json(%{errors: errors})
+  end
+
   def call(conn, {:param_cast, _}) do
     conn
     |> put_status(:bad_request)

test/web/admin_api/controllers/admin_api_controller_test.exs

@@ -1599,14 +1599,14 @@ test "changes actor type from permitted list", %{conn: conn, user: user} do
       assert patch(conn, "/api/pleroma/admin/users/#{user.nickname}/credentials", %{
                "actor_type" => "Application"
              })
-             |> json_response(200) == %{"errors" => %{"actor_type" => "is invalid"}}
+             |> json_response(400) == %{"errors" => %{"actor_type" => "is invalid"}}
     end
 
     test "update non existing user", %{conn: conn} do
       assert patch(conn, "/api/pleroma/admin/users/non-existing/credentials", %{
                "password" => "new_password"
              })
-             |> json_response(200) == %{"error" => "Unable to update user."}
+             |> json_response(404) == %{"error" => "Not found"}
     end
   end