diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-08-04 11:48:57 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-08-04 11:48:57 -0500 |
| commit | 44ede0657f2da0a761de76b1f9822a293430d497 (patch) | |
| tree | 387a8915bdb6ff1295f4f0872b2e6bc97e177831 /lib/pleroma/web/mastodon_api/controllers/app_controller.ex | |
| parent | 1f093cb216ed0d6b0d23b05e1ffbbf55dc72bbee (diff) | |
| parent | d8a986c9e893de8eed3aa336a557695669b1ffee (diff) | |
| download | pleroma-44ede0657f2da0a761de76b1f9822a293430d497.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into staff-plug
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) |