diff options
author | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-12-10 16:54:25 +0000 |
---|---|---|
committer | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-12-10 16:54:25 +0000 |
commit | 8cfaab8f04cae6fcc20a37cdb463ee0c93b71217 (patch) | |
tree | 5ea3e43a73796f264508b583051f6f2143071f00 /lib/pleroma/config.ex | |
parent | 5abee19b63aa1577f8895b48ae69f0a51edb4dc3 (diff) | |
parent | aac0187ec13078d2756db1671e644d6eb9c0947b (diff) | |
download | pleroma-8cfaab8f04cae6fcc20a37cdb463ee0c93b71217.tar.gz |
Merge branch 'develop' into 'domain-block-precedence'
# Conflicts:
# lib/pleroma/user.ex
Diffstat (limited to 'lib/pleroma/config.ex')
-rw-r--r-- | lib/pleroma/config.ex | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/pleroma/config.ex b/lib/pleroma/config.ex index fcc039710..cadab2f15 100644 --- a/lib/pleroma/config.ex +++ b/lib/pleroma/config.ex @@ -65,4 +65,11 @@ 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(scope) do + ["admin:#{scope}"] ++ + if enforce_oauth_admin_scope_usage?(), do: [], else: [scope] + end end |