aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/oauth/oauth_controller.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2019-10-07 12:30:59 +0200
committerlain <lain@soykaf.club>2019-10-07 12:30:59 +0200
commit73b6512907d205d4be49864541eeb941d259aa57 (patch)
tree8441ec250a7e7681b12bdc756df46a9870793149 /lib/pleroma/web/oauth/oauth_controller.ex
parent91e90aa807c2ce346cd453201447806fb71b21fe (diff)
parent93bdc55306895dce0554e7838ecf2ea7ddaea3a7 (diff)
downloadpleroma-73b6512907d205d4be49864541eeb941d259aa57.tar.gz
Merge remote-tracking branch 'origin/develop' into reactions
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
-rw-r--r--lib/pleroma/web/oauth/oauth_controller.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index 1cd7294e7..03c9a5027 100644
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -24,6 +24,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do
plug(:fetch_session)
plug(:fetch_flash)
+ plug(Pleroma.Plugs.RateLimiter, :authentication when action == :create_authorization)
action_fallback(Pleroma.Web.OAuth.FallbackController)
@@ -474,7 +475,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do
defp validate_scopes(app, params) do
params
|> Scopes.fetch_scopes(app.scopes)
- |> Scopes.validates(app.scopes)
+ |> Scopes.validate(app.scopes)
end
def default_redirect_uri(%App{} = app) do