summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kühl <martin.kuehl@gmail.com>2018-09-18 11:39:06 +0200
committerMartin Kühl <martin.kuehl@gmail.com>2018-09-22 07:04:01 +0200
commitc2d592c9c5db8e0392948d5fc589761f482fc4f7 (patch)
treea47286e43bad710955c0323f3b90cc38013ed729
parent3193423be9f288b186fe97997228aae84a8e730c (diff)
downloadpleroma-c2d592c9c5db8e0392948d5fc589761f482fc4f7.tar.gz
pleroma-c2d592c9c5db8e0392948d5fc589761f482fc4f7.zip
Assign token to connection
-rw-r--r--lib/pleroma/plugs/oauth_plug.ex3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/plugs/oauth_plug.ex b/lib/pleroma/plugs/oauth_plug.ex
index 0380ce14d..651485e09 100644
--- a/lib/pleroma/plugs/oauth_plug.ex
+++ b/lib/pleroma/plugs/oauth_plug.ex
@@ -18,10 +18,11 @@ defmodule Pleroma.Plugs.OAuthPlug do
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