X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fo_auth%2Fscopes.ex;h=344ecd631d9f5ed075079f8e0d06ff24e87e4e8b;hb=63ce25f32c9bd0dfd5a4db9ad14b6b773c9b05a9;hp=7fe04b9127fd9905bb01b5738a58b33c57ed643f;hpb=18bf82d7479b0bb767a657e1b7447529f9c2884f;p=akkoma

diff --git a/lib/pleroma/web/o_auth/scopes.ex b/lib/pleroma/web/o_auth/scopes.ex
index 7fe04b912..344ecd631 100644
--- a/lib/pleroma/web/o_auth/scopes.ex
+++ b/lib/pleroma/web/o_auth/scopes.ex
@@ -61,12 +61,19 @@ defmodule Pleroma.Web.OAuth.Scopes do
   def validate(blank_scopes, _app_scopes, _user) when blank_scopes in [nil, []],
     do: {:error, :missing_scopes}
 
-  def validate(scopes, app_scopes, %Pleroma.User{is_admin: is_admin}) do
-    if !is_admin && contains_admin_scopes?(scopes) do
-      {:error, :user_is_not_an_admin}
-    else
-      validate_scopes_are_supported(scopes, app_scopes)
-    end
+  def validate(scopes, app_scopes, _user) do
+    validate_scopes_are_supported(scopes, app_scopes)
+  end
+
+  @spec filter_admin_scopes([String.t()], Pleroma.User.t()) :: [String.t()]
+  @doc """
+  Remove admin scopes for non-admins
+  """
+  def filter_admin_scopes(scopes, %Pleroma.User{is_admin: true}), do: scopes
+
+  def filter_admin_scopes(scopes, _user) do
+    drop_scopes = OAuthScopesPlug.filter_descendants(scopes, ["admin"])
+    Enum.reject(scopes, fn scope -> Enum.member?(drop_scopes, scope) end)
   end
 
   defp validate_scopes_are_supported(scopes, app_scopes) do