summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-12-27 18:14:15 -0600
committerAlex Gleason <alex@alexgleason.me>2021-12-27 18:14:15 -0600
commit2e4a1c56c36fcd4b9ef34bd3a771abfe21cc71d5 (patch)
treecaba43cb815c7212ead60fb4d1f03d01b31e8837 /lib
parentfa35e24a5ec70ecd92e9e31d1e13da44b9e27b6d (diff)
AppController: test creating with and without a user
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/app_controller.ex13
1 files changed, 5 insertions, 8 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/app_controller.ex b/lib/pleroma/web/mastodon_api/controllers/app_controller.ex
index 079382b17..ef7331bf3 100644
--- a/lib/pleroma/web/mastodon_api/controllers/app_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/app_controller.ex
@@ -28,15 +28,9 @@ defmodule Pleroma.Web.MastodonAPI.AppController do
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.AppOperation
@doc "POST /api/v1/apps"
- def create(%{assigns: %{user: user}, body_params: params} = conn, _params) do
+ def create(%{body_params: params} = conn, _params) do
scopes = Scopes.fetch_scopes(params, ["read"])
-
- user_id =
- with %User{id: id} <- user do
- id
- else
- _ -> nil
- end
+ user_id = get_user_id(conn)
app_attrs =
params
@@ -50,6 +44,9 @@ defmodule Pleroma.Web.MastodonAPI.AppController do
end
end
+ defp get_user_id(%{assigns: %{user: %User{id: user_id}}}), do: user_id
+ defp get_user_id(_conn), do: nil
+
@doc """
GET /api/v1/apps/verify_credentials
Gets compact non-secret representation of the app. Supports app tokens and user tokens.