diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-17 16:23:58 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-17 16:23:58 +0300 |
| commit | 6e6f95c6aed77cbde1a58edcdbb5cc4f68416bca (patch) | |
| tree | 923a489a9a6144bd31ff54d24140c1fd1259ae05 /lib/pleroma/web/oauth/scopes.ex | |
| parent | ac672a9d6bfdd3cba7692f80a883bd38b0b09a57 (diff) | |
| parent | 09bd1d12c112fe45563c25a76afde65a3381aa26 (diff) | |
| download | pleroma-6e6f95c6aed77cbde1a58edcdbb5cc4f68416bca.tar.gz | |
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'lib/pleroma/web/oauth/scopes.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/scopes.ex | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/scopes.ex b/lib/pleroma/web/oauth/scopes.ex index 8ecf901f3..1023f16d4 100644 --- a/lib/pleroma/web/oauth/scopes.ex +++ b/lib/pleroma/web/oauth/scopes.ex @@ -15,7 +15,12 @@ defmodule Pleroma.Web.OAuth.Scopes do Note: `scopes` is used by Mastodon — supporting it but sticking to OAuth's standard `scope` wherever we control it """ - @spec fetch_scopes(map(), list()) :: list() + @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) end |