Merge branch 'iss-849' into 'develop'

Parse access_token from body parameters and URL parameters

See merge request pleroma/pleroma!1103
This commit is contained in:
lambda 2019-05-02 14:17:17 +00:00
commit 497d34b825
3 changed files with 32 additions and 1 deletions

View file

@ -16,6 +16,16 @@ defmodule Pleroma.Plugs.OAuthPlug do
def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
def call(%{params: %{"access_token" => access_token}} = conn, _) do
with {:ok, user, token_record} <- fetch_user_and_token(access_token) do
conn
|> assign(:token, token_record)
|> assign(:user, user)
else
_ -> conn
end
end
def call(conn, _) do
with {:ok, token_str} <- fetch_token_str(conn),
{:ok, user, token_record} <- fetch_user_and_token(token_str) do