From: Ivan Tashkinov <ivantashkinov@gmail.com>
Date: Thu, 23 Apr 2020 18:47:33 +0000 (+0300)
Subject: [#2409] Fixed before-action callback results persistence.
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=89f38d94c754d33736e2444859d6020b2147eaf7;p=akkoma

[#2409] Fixed before-action callback results persistence.
---

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