aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/web.ex
diff options
context:
space:
mode:
Diffstat (limited to 'lib/pleroma/web/web.ex')
-rw-r--r--lib/pleroma/web/web.ex6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/web/web.ex b/lib/pleroma/web/web.ex
index ae7c94640..ec1ab4664 100644
--- a/lib/pleroma/web/web.ex
+++ b/lib/pleroma/web/web.ex
@@ -50,7 +50,7 @@ defmodule Pleroma.Web do
end
# Here we can apply before-action hooks (e.g. verify whether auth checks were preformed)
- defp action(conn, params) do
+ def action(conn, params) do
if Pleroma.Plugs.AuthExpectedPlug.auth_expected?(conn) &&
not PlugHelper.plug_called_or_skipped?(conn, Pleroma.Plugs.OAuthScopesPlug) do
conn
@@ -63,6 +63,8 @@ defmodule Pleroma.Web do
super(conn, params)
end
end
+
+ defoverridable(action: 2)
end
end
@@ -81,6 +83,8 @@ defmodule Pleroma.Web do
require Logger
+ alias Pleroma.Web.Endpoint
+
@doc "Same as `render/3` but wrapped in a rescue block"
def safe_render(view, template, assigns \\ %{}) do
Phoenix.View.render(view, template, assigns)