diff options
author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-23 21:47:33 +0300 |
---|---|---|
committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-04-23 21:47:33 +0300 |
commit | 89f38d94c754d33736e2444859d6020b2147eaf7 (patch) | |
tree | 69cf7ee0e2735d5c17532b8e32c2df98eaec434f /lib | |
parent | 0062116e07446beea13768d122e5bcb19c60dde7 (diff) | |
download | pleroma-89f38d94c754d33736e2444859d6020b2147eaf7.tar.gz pleroma-89f38d94c754d33736e2444859d6020b2147eaf7.zip |
[#2409] Fixed before-action callback results persistence.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/web.ex | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/pleroma/web/web.ex b/lib/pleroma/web/web.ex index e2416fb2e..08e42a7e5 100644 --- a/lib/pleroma/web/web.ex +++ b/lib/pleroma/web/web.ex @@ -67,10 +67,10 @@ defmodule Pleroma.Web do # Executed just before actual controller action, invokes before-action hooks (callbacks) defp action(conn, params) do - with %Plug.Conn{halted: false} <- maybe_drop_authentication_if_oauth_check_ignored(conn), - %Plug.Conn{halted: false} <- maybe_perform_public_or_authenticated_check(conn), - %Plug.Conn{halted: false} <- maybe_perform_authenticated_check(conn), - %Plug.Conn{halted: false} <- maybe_halt_on_missing_oauth_scopes_check(conn) do + with %{halted: false} = conn <- maybe_drop_authentication_if_oauth_check_ignored(conn), + %{halted: false} = conn <- maybe_perform_public_or_authenticated_check(conn), + %{halted: false} = conn <- maybe_perform_authenticated_check(conn), + %{halted: false} = conn <- maybe_halt_on_missing_oauth_scopes_check(conn) do super(conn, params) end end |