hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[#2349] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.

Browse source
This commit is contained in:
Ivan Tashkinov 2020-04-15 21:19:16 +03:00
commit bde1189c34
7 changed files with 140 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/plugs/auth_expected_plug.ex
View file

@ -10,4 +10,8 @@ defmodule Pleroma.Plugs.AuthExpectedPlug do
def call(conn, _) do
put_private(conn, :auth_expected, true)
end
def auth_expected?(conn) do
conn.private[:auth_expected]
end
end

6
lib/pleroma/plugs/oauth_scopes_plug.ex
View file

@ -10,13 +10,13 @@ defmodule Pleroma.Plugs.OAuthScopesPlug do
alias Pleroma.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Plugs.PlugHelper
use Pleroma.Web, :plug
@behaviour Plug
def init(%{scopes: _} = options), do: options
def call(%Plug.Conn{assigns: assigns} = conn, %{scopes: scopes} = options) do
conn = PlugHelper.append_to_called_plugs(conn, __MODULE__)
def perform(%Plug.Conn{assigns: assigns} = conn, %{scopes: scopes} = options) do
op = options[:op] || :|
token = assigns[:token]