mirror of
https://git.pleroma.social/pleroma/pleroma.git
synced 2024-12-22 16:16:34 +00:00
Merge branch 'token-view-scopes' into 'develop'
Include session scopes in TokenView See merge request pleroma/pleroma!4273
This commit is contained in:
commit
62bbed1e58
3 changed files with 4 additions and 2 deletions
1
changelog.d/token-view-scopes.add
Normal file
1
changelog.d/token-view-scopes.add
Normal file
|
@ -0,0 +1 @@
|
||||||
|
Include session scopes in TokenView
|
|
@ -15,7 +15,8 @@ defmodule Pleroma.Web.TwitterAPI.TokenView do
|
||||||
%{
|
%{
|
||||||
id: token_entry.id,
|
id: token_entry.id,
|
||||||
valid_until: token_entry.valid_until,
|
valid_until: token_entry.valid_until,
|
||||||
app_name: token_entry.app.client_name
|
app_name: token_entry.app.client_name,
|
||||||
|
scopes: token_entry.scopes
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -69,7 +69,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
|
||||||
|> hd()
|
|> hd()
|
||||||
|> Map.keys()
|
|> Map.keys()
|
||||||
|
|
||||||
assert keys -- ["id", "app_name", "valid_until"] == []
|
assert Enum.sort(keys) == Enum.sort(["id", "app_name", "valid_until", "scopes"])
|
||||||
end
|
end
|
||||||
|
|
||||||
test "revoke token", %{token: token} do
|
test "revoke token", %{token: token} do
|
||||||
|
|
Loading…
Reference in a new issue