From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 6 Jan 2021 21:15:47 +0000 (-0600)
Subject: Call ConfirmUserPlug from Router, not Endpoint
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7b8dbaff310976e2ad081213a4b3dd28e21e7842;p=akkoma

Call ConfirmUserPlug from Router, not Endpoint
---

diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index 705035845..f26542e88 100644
--- 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 aefc9f0be..0deb64735 100644
--- 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