[#2409] Fixed before-action callback results persistence.
authorIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 23 Apr 2020 18:47:33 +0000 (21:47 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Thu, 23 Apr 2020 18:47:33 +0000 (21:47 +0300)
lib/pleroma/web/web.ex

index e2416fb2ea9dfbcbcc27c01602fd9702a5f5d565..08e42a7e5398737cd14f1f8b9e7c80b1f8c60834 100644 (file)
@@ -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