fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-29 03:53:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

AccountController: Return scope in proper format.

Browse source
This commit is contained in:
lain 2020-06-26 16:15:27 +02:00
parent 6db9f7cdb3
commit f378e93bf4
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/api_spec/operations/account_operation.ex
View file

@ -446,13 +446,13 @@ defmodule Pleroma.Web.ApiSpec.AccountOperation do
properties: %{
token_type: %Schema{type: :string},
access_token: %Schema{type: :string},
scope: %Schema{type: :array, items: %Schema{type: :string}},
scope: %Schema{type: :string},
created_at: %Schema{type: :integer, format: :"date-time"}
},
example: %{
"access_token" => "i9hAVVzGld86Pl5JtLtizKoXVvtTlSCJvwaugCxvZzk",
"created_at" => 1_585_918_714,
"scope" => ["read", "write", "follow", "push"],
"scope" => "read write follow push",
"token_type" => "Bearer"
}
}

2
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
View file

@ -104,7 +104,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do
json(conn, %{
token_type: "Bearer",
access_token: token.token,
scope: app.scopes,
scope: app.scopes |> Enum.join(" "),
created_at: Token.Utils.format_created_at(token)
})
else

6
test/web/mastodon_api/controllers/account_controller_test.exs
View file

@ -905,7 +905,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
%{
"access_token" => token,
"created_at" => _created_at,
"scope" => _scope,
"scope" => ^scope,
"token_type" => "Bearer"
} = json_response_and_validate_schema(conn, 200)
@ -1067,7 +1067,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
assert %{
"access_token" => access_token,
"created_at" => _,
"scope" => ["read", "write", "follow", "push"],
"scope" => "read write follow push",
"token_type" => "Bearer"
} = response
@ -1185,7 +1185,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountControllerTest do
assert %{
"access_token" => access_token,
"created_at" => _,
"scope" => ["read"],
"scope" => "read",
"token_type" => "Bearer"
} =
conn