Assign token to connection

[akkoma] / lib / pleroma / plugs / oauth_plug.ex

diff --git a/lib/pleroma/plugs/oauth_plug.ex b/lib/pleroma/plugs/oauth_plug.ex
index be737dc9a22e7738893fee460879db7bf6262bba..651485e092d53fbf1d7ded4828e599246859d762 100644 (file)
--- a/lib/pleroma/plugs/oauth_plug.ex
+++ b/lib/pleroma/plugs/oauth_plug.ex
@@ -9,16 +9,20 @@ defmodule Pleroma.Plugs.OAuthPlug do
   end
 
   def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
+
   def call(conn, _) do
-    token = case get_req_header(conn, "authorization") do
-              ["Bearer " <> header] -> header
-              _ -> get_session(conn, :oauth_token)
-            end
+    token =
+      case get_req_header(conn, "authorization") do
+        ["Bearer " <> header] -> header
+        _ -> get_session(conn, :oauth_token)
+      end
+
     with token when not is_nil(token) <- token,
-         %Token{user_id: user_id} <- Repo.get_by(Token, token: token),
+         %Token{user_id: user_id} = token <- Repo.get_by(Token, token: token),
          %User{} = user <- Repo.get(User, user_id),
          false <- !!user.info["deactivated"] do
       conn
+      |> assign(:token, token)
       |> assign(:user, user)
     else
       _ -> conn