Merge pull request 'Correct og:description tag in static-fe' (#373) from sfr/akkoma...

[akkoma] / lib / pleroma / web / o_auth / scopes.ex

diff --git a/lib/pleroma/web/o_auth/scopes.ex b/lib/pleroma/web/o_auth/scopes.ex
index ccd8d4665d8a4d0bd5f2f1fa9d58dc66fe05e1a8..344ecd631d9f5ed075079f8e0d06ff24e87e4e8b 100644 (file)
--- a/lib/pleroma/web/o_auth/scopes.ex
+++ b/lib/pleroma/web/o_auth/scopes.ex
@@ -61,12 +61,8 @@ 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()]