diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:18:57 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-04-10 14:18:57 +0400 |
| commit | cf2a0574e77ed207453215ae83377a3eb8f2fa0c (patch) | |
| tree | fdc89909325238b71c8fc07a63d8720e432434c4 /lib/pleroma/web/oauth/scopes.ex | |
| parent | 4a2538967caf5b0f9970cc5f973c16ea5d776aa3 (diff) | |
| parent | ce089615e1e89fbb63b0c0548906f3b6c22abac2 (diff) | |
| download | pleroma-cf2a0574e77ed207453215ae83377a3eb8f2fa0c.tar.gz | |
Merge branch 'develop' into fix/support-conversations-pagination
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 |