diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-07-27 08:54:26 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-07-27 08:54:26 -0500 |
| commit | 7f23dd6cc867e839ec721d34e3c114a68a5aed9e (patch) | |
| tree | e1502ee85803ecc5050a213ab07cfb105d0ed41f /lib/pleroma/web/mastodon_api/controllers/app_controller.ex | |
| parent | 9cc8642b80a3eceac405751a9c6b0be8e55db56d (diff) | |
| parent | 7acdab1f305bac744a302e3b44e2e920d6bc8a47 (diff) | |
| download | pleroma-7f23dd6cc867e839ec721d34e3c114a68a5aed9e.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into object-tombstone-visibility
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers/app_controller.ex')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/app_controller.ex | 8 |
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) |