diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-17 16:23:58 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-17 16:23:58 +0300 |
| commit | 6e6f95c6aed77cbde1a58edcdbb5cc4f68416bca (patch) | |
| tree | 923a489a9a6144bd31ff54d24140c1fd1259ae05 /lib/pleroma/web/oauth/oauth_controller.ex | |
| parent | ac672a9d6bfdd3cba7692f80a883bd38b0b09a57 (diff) | |
| parent | 09bd1d12c112fe45563c25a76afde65a3381aa26 (diff) | |
| download | pleroma-6e6f95c6aed77cbde1a58edcdbb5cc4f68416bca.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 46688db7e..0121cd661 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -27,6 +27,8 @@ defmodule Pleroma.Web.OAuth.OAuthController do plug(:fetch_flash) plug(RateLimiter, [name: :authentication] when action == :create_authorization) + plug(:skip_plug, Pleroma.Plugs.OAuthScopesPlug) + action_fallback(Pleroma.Web.OAuth.FallbackController) @oob_token_redirect_uri "urn:ietf:wg:oauth:2.0:oob" |