aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2020-08-06 16:00:00 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2020-08-06 16:00:00 +0300
commit135ae4e35a3e6a084eb611ce3a21c7a6c6bba9fc (patch)
tree06f4633e90ae43a772fd2b5bc4998a91c139ad8c /lib
parent10b0e55acffeeff5842421c12b3b26feb35336de (diff)
downloadpleroma-135ae4e35a3e6a084eb611ce3a21c7a6c6bba9fc.tar.gz
[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/oauth/oauth_controller.ex7
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index f29b3cb57..dd00600ea 100644
--- a/lib/pleroma/web/oauth/oauth_controller.ex
+++ b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -76,6 +76,13 @@ defmodule Pleroma.Web.OAuth.OAuthController do
available_scopes = (app && app.scopes) || []
scopes = Scopes.fetch_scopes(params, available_scopes)
+ scopes =
+ if scopes == [] do
+ available_scopes
+ else
+ scopes
+ end
+
# Note: `params` might differ from `conn.params`; use `@params` not `@conn.params` in template
render(conn, Authenticator.auth_template(), %{
response_type: params["response_type"],