diff options
| author | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-10-07 02:14:45 +0000 |
|---|---|---|
| committer | Haelwenn <contact+git.pleroma.social@hacktivis.me> | 2019-10-07 02:14:45 +0000 |
| commit | b4f3c16885a489c40de82e5ef321caafa4b10c81 (patch) | |
| tree | e81e3d7ba6882b31bd18c221f872049af73e44f2 /lib/pleroma/web/oauth/oauth_controller.ex | |
| parent | 25cffffaf1685ef02cd318bdbd99bb325d295458 (diff) | |
| parent | b93856874de673f1c05c557ad482d4480ca7e0a7 (diff) | |
| download | pleroma-b4f3c16885a489c40de82e5ef321caafa4b10c81.tar.gz | |
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
[#1234] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 1cd7294e7..3c17a2095 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -474,7 +474,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do defp validate_scopes(app, params) do params |> Scopes.fetch_scopes(app.scopes) - |> Scopes.validates(app.scopes) + |> Scopes.validate(app.scopes) end def default_redirect_uri(%App{} = app) do |