aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/controller_helper.ex
diff options
context:
space:
mode:
authorIvan Tashkinov <ivantashkinov@gmail.com>2019-02-15 19:54:37 +0300
committerIvan Tashkinov <ivantashkinov@gmail.com>2019-02-15 19:54:37 +0300
commit2a4a4f3342bb3d2bbbd2354e858278d2e17f8654 (patch)
tree11b0ef4815c5db986d4051ce9e3538dc8ffea6bb /lib/pleroma/web/controller_helper.ex
parent027adbc9e5c60cd43b8857eb7a3124e6df1310c2 (diff)
downloadpleroma-2a4a4f3342bb3d2bbbd2354e858278d2e17f8654.tar.gz
[#468] Defined OAuth restrictions for all applicable routes.
Improved missing "scopes" param handling. Allowed "any of" / "all of" mode specification in OAuthScopesPlug. Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
Diffstat (limited to 'lib/pleroma/web/controller_helper.ex')
-rw-r--r--lib/pleroma/web/controller_helper.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/controller_helper.ex b/lib/pleroma/web/controller_helper.ex
index a32195b49..8f36329ee 100644
--- a/lib/pleroma/web/controller_helper.ex
+++ b/lib/pleroma/web/controller_helper.ex
@@ -6,7 +6,7 @@ defmodule Pleroma.Web.ControllerHelper do
use Pleroma.Web, :controller
def oauth_scopes(params, default) do
- Pleroma.Web.OAuth.parse_scopes(params["scopes"] || params["scope"], default)
+ Pleroma.Web.OAuth.parse_scopes(params["scope"] || params["scopes"], default)
end
def json_response(conn, status, json) do