aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAkiraFukushima <h3.poteto@gmail.com>2019-05-02 21:04:00 +0900
committerAkiraFukushima <h3.poteto@gmail.com>2019-05-02 21:04:00 +0900
commit533d8cd5816343ccfb6e26495124416e9808554c (patch)
treea62fecba727c0c5ca78cb2d9b5d331367543eff7 /lib
parent0fd176b990887c170928bc0ce7d43d3a0aab8f7f (diff)
downloadpleroma-533d8cd5816343ccfb6e26495124416e9808554c.tar.gz
Parse access_token from body parameters and URL parameters
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/plugs/oauth_plug.ex10
1 files changed, 10 insertions, 0 deletions
diff --git a/lib/pleroma/plugs/oauth_plug.ex b/lib/pleroma/plugs/oauth_plug.ex
index 5888d596a..9d43732eb 100644
--- a/lib/pleroma/plugs/oauth_plug.ex
+++ b/lib/pleroma/plugs/oauth_plug.ex
@@ -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