diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-01 17:38:57 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-01 17:38:57 +0400 |
| commit | 6b84c62d4a51cb17192945d1b67999b2c56a23d2 (patch) | |
| tree | 53744600bd910bb0a62be6ab5884c6972da2ffce /lib/pleroma/web/oauth/scopes.ex | |
| parent | cb8236cda62cddb72f4320af6347defae44b81ca (diff) | |
| parent | e96765df6b04fe5e9766271a9c62e559392758b2 (diff) | |
| download | pleroma-6b84c62d4a51cb17192945d1b67999b2c56a23d2.tar.gz | |
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
Diffstat (limited to 'lib/pleroma/web/oauth/scopes.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/scopes.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/oauth/scopes.ex b/lib/pleroma/web/oauth/scopes.ex index 8ecf901f3..6f06f1431 100644 --- a/lib/pleroma/web/oauth/scopes.ex +++ b/lib/pleroma/web/oauth/scopes.ex @@ -15,9 +15,10 @@ 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(params, default) do - parse_scopes(params["scope"] || params["scopes"], default) + parse_scopes(params["scope"] || params["scopes"] || params[:scopes], default) end def parse_scopes(scopes, _default) when is_list(scopes) do |