diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-13 21:19:27 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-04-13 21:19:27 +0300 |
| commit | a16b3dbcbf19d584eaefbecbfb4ff34fa7b3743a (patch) | |
| tree | 33a566478405ab5da9e6cdb5f77bb59a3ff3be0c /lib/pleroma/web/oauth | |
| parent | 2b7d7bbd2dc3121488592a958c29ba6a418e0104 (diff) | |
| parent | ef37774403ff5af69a637875240eec205b6f55a5 (diff) | |
| download | pleroma-a16b3dbcbf19d584eaefbecbfb4ff34fa7b3743a.tar.gz | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'lib/pleroma/web/oauth')
| -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 |