X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fplugs%2Fuser_is_admin_plug.ex;h=488a61d1d4940304423694a94c8127a43a8ca139;hb=9c672ecbb5d4477cd16d2139a2cb66d3923ac5c8;hp=4a0e43b003e805e182bc462e342bdce18434a18c;hpb=40e1817f707c3c2ef253009c7363cd81b11322a6;p=akkoma

diff --git a/lib/pleroma/plugs/user_is_admin_plug.ex b/lib/pleroma/plugs/user_is_admin_plug.ex
index 4a0e43b00..488a61d1d 100644
--- a/lib/pleroma/plugs/user_is_admin_plug.ex
+++ b/lib/pleroma/plugs/user_is_admin_plug.ex
@@ -1,34 +1,24 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Plugs.UserIsAdminPlug do
   import Pleroma.Web.TranslationHelpers
   import Plug.Conn
 
-  alias Pleroma.Web.OAuth
+  alias Pleroma.User
 
   def init(options) do
     options
   end
 
-  def call(%Plug.Conn{assigns: assigns} = conn, _) do
-    token = assigns[:token]
-    user = assigns[:user]
-
-    cond do
-      token && OAuth.Scopes.contains_admin_scopes?(token.scopes) ->
-        # Note: checking for _any_ admin scope presence, not necessarily fitting requested action.
-        #   Thus, controller must explicitly invoke OAuthScopesPlug to verify scope requirements.
-        conn
-
-      user && user.is_admin && !Pleroma.Config.enforce_oauth_admin_scope_usage?() ->
-        conn
+  def call(%{assigns: %{user: %User{is_admin: true}}} = conn, _) do
+    conn
+  end
 
-      true ->
-        conn
-        |> render_error(:forbidden, "User is not an admin or OAuth admin scope is not granted.")
-        |> halt()
-    end
+  def call(conn, _) do
+    conn
+    |> render_error(:forbidden, "User is not an admin.")
+    |> halt()
   end
 end