mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-22 16:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix/disclose_client' into 'develop'

Browse source 
Fix User.disclose_client never working correctly

See merge request pleroma/pleroma!4199
This commit is contained in:
feld 2024-07-31 18:38:49 +00:00
commit f2dc706f6f
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/disclose_client.fix Normal file
View file

@ -0,0 +1 @@
Client application data was always missing from the status

2
lib/pleroma/web/plugs/o_auth_plug.ex
View file

@ -52,7 +52,7 @@ defmodule Pleroma.Web.Plugs.OAuthPlug do
where: t.token == ^token where: t.token == ^token
) )
with %Token{user_id: user_id} = token_record <- Repo.one(token_query), with %Token{user_id: user_id} = token_record <- Repo.one(token_query) |> Repo.preload(:user),
false <- is_nil(user_id), false <- is_nil(user_id),
%User{} = user <- User.get_cached_by_id(user_id) do %User{} = user <- User.get_cached_by_id(user_id) do
{:ok, user, token_record} {:ok, user, token_record}