diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2020-04-26 04:06:13 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2020-04-26 04:06:13 +0300 |
| commit | eeb0d8be45baf7fdc5afdbc19598abd6948394d9 (patch) | |
| tree | b4148e4f08983c53a83c1e475dacb715bd147773 /lib/pleroma/web/oauth/scopes.ex | |
| parent | 1919d9d0db29f561560e3d094391eb9b4cd58881 (diff) | |
| parent | dbc4791d9d53c09dc0e6183b74924063e0a90dc6 (diff) | |
| download | pleroma-eeb0d8be45baf7fdc5afdbc19598abd6948394d9.tar.gz | |
Merge branch 'develop' into refactor/fe-bundles
Diffstat (limited to 'lib/pleroma/web/oauth/scopes.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/scopes.ex | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/pleroma/web/oauth/scopes.ex b/lib/pleroma/web/oauth/scopes.ex index 1023f16d4..6f06f1431 100644 --- a/lib/pleroma/web/oauth/scopes.ex +++ b/lib/pleroma/web/oauth/scopes.ex @@ -17,12 +17,8 @@ defmodule Pleroma.Web.OAuth.Scopes do """ @spec fetch_scopes(map() | struct(), list()) :: list() - def fetch_scopes(%Pleroma.Web.ApiSpec.Schemas.AppCreateRequest{scopes: scopes}, default) do - parse_scopes(scopes, default) - end - def fetch_scopes(params, default) do - parse_scopes(params["scope"] || params["scopes"], default) + parse_scopes(params["scope"] || params["scopes"] || params[:scopes], default) end def parse_scopes(scopes, _default) when is_list(scopes) do |