diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-02-17 22:31:11 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2021-02-17 22:31:11 +0000 |
| commit | c0437d12440acb08f30a456fade657de735c19d8 (patch) | |
| tree | 36eb248552c51c1bd234966b65b2aa9a855772cd /lib/pleroma/config.ex | |
| parent | 679a2e799e464f044d7afceb4c9a650d2d3b2e2a (diff) | |
| parent | 2ab9499258ee4abe92dd89dfe8ebaf0a7dad7564 (diff) | |
| download | pleroma-c0437d12440acb08f30a456fade657de735c19d8.tar.gz | |
Merge branch 'feat/enforce-admin-scope-unconditionally' into 'develop'
Remove `:auth, :enforce_oauth_admin_scope_usage`
See merge request pleroma/pleroma!3327
Diffstat (limited to 'lib/pleroma/config.ex')
| -rw-r--r-- | lib/pleroma/config.ex | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex index f17e14128..2e15a3719 100644 --- a/lib/pleroma/config.ex +++ b/lib/pleroma/config.ex @@ -99,16 +99,4 @@ defmodule Pleroma.Config do def oauth_consumer_strategies, do: get([:auth, :oauth_consumer_strategies], []) def oauth_consumer_enabled?, do: oauth_consumer_strategies() != [] - - def enforce_oauth_admin_scope_usage?, do: !!get([:auth, :enforce_oauth_admin_scope_usage]) - - 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 |