aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/oauth/oauth_controller.ex
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-05-05 14:28:54 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-05-05 14:28:54 +0400
commitdecaa64f75f8bd69622fa5fba757f99719f09808 (patch)
tree52d3bfc7318230beae31865c7f0a12e02b7f68b5 /lib/pleroma/web/oauth/oauth_controller.ex
parent764b4f95a8e9e751d5a6136fc2be44d61a082443 (diff)
parentc297667f16db40654bb16608c01dc4a2dc7c0e4b (diff)
downloadpleroma-decaa64f75f8bd69622fa5fba757f99719f09808.tar.gz
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
-rw-r--r--lib/pleroma/web/oauth/oauth_controller.ex5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index 0121cd661..685269877 100644
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -25,9 +25,10 @@ defmodule Pleroma.Web.OAuth.OAuthController do
plug(:fetch_session)
plug(:fetch_flash)
- plug(RateLimiter, [name: :authentication] when action == :create_authorization)
- plug(:skip_plug, Pleroma.Plugs.OAuthScopesPlug)
+ plug(:skip_plug, [Pleroma.Plugs.OAuthScopesPlug, Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug])
+
+ plug(RateLimiter, [name: :authentication] when action == :create_authorization)
action_fallback(Pleroma.Web.OAuth.FallbackController)