Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop

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

diff --git a/lib/pleroma/plugs/oauth_plug.ex b/lib/pleroma/plugs/oauth_plug.ex
index fc2a907a2ff3d5a928739c39045ff58c5bc699d7..8366e35afbe983e1e373693b11da6b73df1e4167 100644 (file)
--- a/lib/pleroma/plugs/oauth_plug.ex
+++ b/lib/pleroma/plugs/oauth_plug.ex
@@ -10,8 +10,12 @@ defmodule Pleroma.Plugs.OAuthPlug do
 
   def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
   def call(conn, opts) do
-    with ["Bearer " <> header] <- get_req_header(conn, "authorization"),
-         %Token{user_id: user_id} <- Repo.get_by(Token, token: header),
+    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),
          %User{} = user <- Repo.get(User, user_id) do
       conn
       |> assign(:user, user)