Call ConfirmUserPlug from Router, not Endpoint

diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index 705035845d0921badfb112052351298ba39832ea..f26542e888c435917c48b08d62664fc569d4aa5d 100644 (file)
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -169,8 +169,6 @@ defmodule Pleroma.Web.Endpoint do
 
   plug(MetricsExporterCaller)
 
-  plug(Pleroma.Web.Plugs.ConfirmUserPlug)
-
   plug(Pleroma.Web.Router)
 
   @doc """

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index aefc9f0be47598df4bcf0acbff48c5347277e5ce..0deb647355cf26bc027766b2ac43164c0133b888 100644 (file)
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -56,6 +56,7 @@ defmodule Pleroma.Web.Router do
     plug(Pleroma.Web.Plugs.UserEnabledPlug)
     plug(Pleroma.Web.Plugs.SetUserSessionIdPlug)
     plug(Pleroma.Web.Plugs.EnsureUserTokenAssignsPlug)
+    plug(Pleroma.Web.Plugs.ConfirmUserPlug)
   end
 
   pipeline :base_api do