diff options
author | Mark Felder <feld@FreeBSD.org> | 2019-12-11 15:02:53 -0600 |
---|---|---|
committer | Mark Felder <feld@FreeBSD.org> | 2019-12-11 15:02:53 -0600 |
commit | 9ef912aecfbeef670db0614ec2014321c37f3b7a (patch) | |
tree | 69eb0b5e11ca321e1ba8ca794171bf0cb425d16d /config/description.exs | |
parent | e21afdb7c76c9773aeb51e37ff3bc2874e7a74f7 (diff) | |
parent | 92b4a1aa1bc750bb077ae45c422967f9712e247d (diff) | |
download | pleroma-9ef912aecfbeef670db0614ec2014321c37f3b7a.tar.gz pleroma-9ef912aecfbeef670db0614ec2014321c37f3b7a.zip |
Merge branch 'develop' into issue/1411
Diffstat (limited to 'config/description.exs')
-rw-r--r-- | config/description.exs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/config/description.exs b/config/description.exs index 70e963399..45e4b43f1 100644 --- a/config/description.exs +++ b/config/description.exs @@ -2095,6 +2095,15 @@ config :pleroma, :config_description, [ description: "Authentication / authorization settings", children: [ %{ + key: :enforce_oauth_admin_scope_usage, + type: :boolean, + description: + "OAuth admin scope requirement toggle. " <> + "If `true`, admin actions explicitly demand admin OAuth scope(s) presence in OAuth token " <> + "(client app must support admin scopes). If `false` and token doesn't have admin scope(s)," <> + "`is_admin` user flag grants access to admin-specific actions." + }, + %{ key: :auth_template, type: :string, description: |