aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/oauth/oauth_controller.ex
diff options
context:
space:
mode:
authorEgor Kislitsyn <egor@kislitsyn.com>2020-04-30 13:51:27 +0400
committerEgor Kislitsyn <egor@kislitsyn.com>2020-04-30 13:51:27 +0400
commit1898054da4bcccb25e0bcd9d6463af38ced43351 (patch)
tree66c8eab923d261a1b802046afa50aa77926171d4 /lib/pleroma/web/oauth/oauth_controller.ex
parent560f2c1979ca4d49f18abd6de6aac49875bfc771 (diff)
parentdae91630606d6ba408b3f340b6b450703c164ce1 (diff)
downloadpleroma-1898054da4bcccb25e0bcd9d6463af38ced43351.tar.gz
Merge branch 'develop' into openapi/reports
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)