hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#1427] Fixed :admin option handling in OAuthScopesPlug, added tests.

Browse source
This commit is contained in:
Ivan Tashkinov 2019-12-11 11:42:02 +03:00
commit 3920244be5
3 changed files with 56 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/pleroma/config.ex
View file

@ -68,8 +68,13 @@ defmodule Pleroma.Config do
def enforce_oauth_admin_scope_usage?, do: !!get([:auth, :enforce_oauth_admin_scope_usage])
def oauth_admin_scopes(scope) do
["admin:#{scope}"] ++
if enforce_oauth_admin_scope_usage?(), do: [], else: [scope]
def oauth_admin_scopes(scopes) when is_list(scopes) do
Enum.flat_map(
scopes,
fn scope ->
["admin:#{scope}"] ++
if enforce_oauth_admin_scope_usage?(), do: [], else: [scope]
end
)
end
end