projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add link verification in profile fields (#405)
[akkoma]
/
lib
/
pleroma
/
web
/
plugs
/
o_auth_plug.ex
diff --git
a/lib/pleroma/web/plugs/o_auth_plug.ex
b/lib/pleroma/web/plugs/o_auth_plug.ex
index 5e06ac3f68ea17a0111c4b560d91c2fe717414aa..91f6e997419312c580dd4f600aee22fc003b9823 100644
(file)
--- a/
lib/pleroma/web/plugs/o_auth_plug.ex
+++ b/
lib/pleroma/web/plugs/o_auth_plug.ex
@@
-47,15
+47,17
@@
defmodule Pleroma.Web.Plugs.OAuthPlug do
#
@spec fetch_user_and_token(String.t()) :: {:ok, User.t(), Token.t()} | nil
defp fetch_user_and_token(token) do
#
@spec fetch_user_and_token(String.t()) :: {:ok, User.t(), Token.t()} | nil
defp fetch_user_and_token(token) do
- query =
+
token_
query =
from(t in Token,
from(t in Token,
- where: t.token == ^token,
- join: user in assoc(t, :user),
- preload: [user: user]
+ where: t.token == ^token
)
)
- with %Token{user: user} = token_record <- Repo.one(query) do
+ with %Token{user_id: user_id} = token_record <- Repo.one(token_query),
+ false <- is_nil(user_id),
+ %User{} = user <- User.get_cached_by_id(user_id) do
{:ok, user, token_record}
{:ok, user, token_record}
+ else
+ _ -> nil
end
end
end
end