Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.

[akkoma] / lib / pleroma / web / plugs / user_enabled_plug.ex

diff --git a/lib/pleroma/web/plugs/user_enabled_plug.ex b/lib/pleroma/web/plugs/user_enabled_plug.ex
index fa28ee48b7179c0ffa661529f5392e30c4591091..291d1f568009753751cd6fd04d14827d2f4301e1 100644 (file)
--- a/lib/pleroma/web/plugs/user_enabled_plug.ex
+++ b/lib/pleroma/web/plugs/user_enabled_plug.ex
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.Plugs.UserEnabledPlug do
-  import Plug.Conn
+  alias Pleroma.Helpers.AuthHelper
   alias Pleroma.User
 
   def init(options) do
@@ -12,8 +12,11 @@ defmodule Pleroma.Web.Plugs.UserEnabledPlug do
 
   def call(%{assigns: %{user: %User{} = user}} = conn, _) do
     case User.account_status(user) do
-      :active -> conn
-      _ -> assign(conn, :user, nil)
+      :active ->
+        conn
+
+      _ ->
+        AuthHelper.drop_auth_info(conn)
     end
   end