diff options
| author | lain <lain@soykaf.club> | 2024-11-12 11:18:10 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2024-11-12 11:18:10 +0000 |
| commit | 62bbed1e586461f99053a2e36dda8904d4dfebee (patch) | |
| tree | 1fecce0c09aa23ebf2548b701737c4136840ec37 | |
| parent | 4626a9280aec1225e822bb2388903065ccebfd50 (diff) | |
| parent | 29b048d351fb9867f11892315bed49adfbb282fb (diff) | |
| download | pleroma-62bbed1e586461f99053a2e36dda8904d4dfebee.tar.gz pleroma-62bbed1e586461f99053a2e36dda8904d4dfebee.zip | |
Merge branch 'token-view-scopes' into 'develop'
Include session scopes in TokenView
See merge request pleroma/pleroma!4273
| -rw-r--r-- | changelog.d/token-view-scopes.add | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/views/token_view.ex | 3 | ||||
| -rw-r--r-- | test/pleroma/web/twitter_api/controller_test.exs | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/changelog.d/token-view-scopes.add b/changelog.d/token-view-scopes.add new file mode 100644 index 000000000..e24fa38e6 --- /dev/null +++ b/changelog.d/token-view-scopes.add @@ -0,0 +1 @@ +Include session scopes in TokenView
\ No newline at end of file diff --git a/lib/pleroma/web/twitter_api/views/token_view.ex b/lib/pleroma/web/twitter_api/views/token_view.ex index 2e492c13f..36776ce3b 100644 --- a/lib/pleroma/web/twitter_api/views/token_view.ex +++ b/lib/pleroma/web/twitter_api/views/token_view.ex @@ -15,7 +15,8 @@ defmodule Pleroma.Web.TwitterAPI.TokenView do %{ id: token_entry.id, 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 diff --git a/test/pleroma/web/twitter_api/controller_test.exs b/test/pleroma/web/twitter_api/controller_test.exs index 495d371d2..494be9ec7 100644 --- a/test/pleroma/web/twitter_api/controller_test.exs +++ b/test/pleroma/web/twitter_api/controller_test.exs @@ -69,7 +69,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do |> hd() |> Map.keys() - assert keys -- ["id", "app_name", "valid_until"] == [] + assert Enum.sort(keys) == Enum.sort(["id", "app_name", "valid_until", "scopes"]) end test "revoke token", %{token: token} do |