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

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

diff --git a/lib/pleroma/web/plugs/set_user_session_id_plug.ex b/lib/pleroma/web/plugs/set_user_session_id_plug.ex
index 6ddb6b5e58fe9db12445da3260ed4cf2d3b467e2..d2338c03f681c073fde571bf350a556e8a19800f 100644 (file)
--- a/lib/pleroma/web/plugs/set_user_session_id_plug.ex
+++ b/lib/pleroma/web/plugs/set_user_session_id_plug.ex
@@ -4,14 +4,15 @@
 
 defmodule Pleroma.Web.Plugs.SetUserSessionIdPlug do
   import Plug.Conn
-  alias Pleroma.User
+
+  alias Pleroma.Web.OAuth.Token
 
   def init(opts) do
     opts
   end
 
-  def call(%{assigns: %{user: %User{id: id}}} = conn, _) do
-    put_session(conn, :user_id, id)
+  def call(%{assigns: %{token: %Token{} = oauth_token}} = conn, _) do
+    put_session(conn, :oauth_token, oauth_token.token)
   end
 
   def call(conn, _), do: conn