aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers/app_controller.ex
diff options
context:
space:
mode:
authorAlex Gleason <alex@alexgleason.me>2021-08-05 09:43:24 -0500
committerAlex Gleason <alex@alexgleason.me>2021-08-05 11:11:24 -0500
commitb83758bd9634d4f2fb70a92159072dd44e49bb31 (patch)
tree2452e8c4e1544fc9a0ad71292901b6cd52765566 /lib/pleroma/web/mastodon_api/controllers/app_controller.ex
parent2b3d7794b23aac30cf8f977009d17b1abc602d19 (diff)
parent5f5dc24027ee5cfadd226c5db2e2a2bdb0ababe0 (diff)
downloadpleroma-b83758bd9634d4f2fb70a92159072dd44e49bb31.tar.gz
Merge remote-tracking branch 'pleroma/develop' into moderators
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/app_controller.ex')
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/app_controller.ex8
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/app_controller.ex b/lib/pleroma/web/mastodon_api/controllers/app_controller.ex
index dd3b39c77..a95cc52fd 100644
--- a/lib/pleroma/web/mastodon_api/controllers/app_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/app_controller.ex
@@ -14,16 +14,10 @@ defmodule Pleroma.Web.MastodonAPI.AppController do
alias Pleroma.Web.OAuth.App
alias Pleroma.Web.OAuth.Scopes
alias Pleroma.Web.OAuth.Token
- alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
- alias Pleroma.Web.Plugs.OAuthScopesPlug
action_fallback(Pleroma.Web.MastodonAPI.FallbackController)
- plug(
- :skip_plug,
- [OAuthScopesPlug, EnsurePublicOrAuthenticatedPlug]
- when action in [:create, :verify_credentials]
- )
+ plug(:skip_auth when action in [:create, :verify_credentials])
plug(Pleroma.Web.ApiSpec.CastAndValidate)