summaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers/app_controller.ex
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-08-08 14:37:15 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-08-08 14:37:15 +0000
commitdc63aaf84f07a6f8042f43617d8ec356fed85cec (patch)
tree5d12a05bce5dc1a23736fd37e7ca8c64580acd34 /lib/pleroma/web/mastodon_api/controllers/app_controller.ex
parentb221d77a6da07c684bdbc63ddf4500e0d7ffeae8 (diff)
parent0910777d41f8b4b3096c35c5fc97fc357e5d8c8c (diff)
Merge branch 'release/2.4.0' into 'stable'v2.4.0
Release/2.4.0 See merge request pleroma/pleroma!3493
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)