aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-06-26 16:15:27 +0200
committerlain <lain@soykaf.club>2020-06-26 16:15:27 +0200
commitf378e93bf4ca4bc9547f242e76e6258e25852972 (patch)
tree9ec39c49ba561b7d12ef600592f7865b8d90f38d /lib
parent6db9f7cdb3adeda547b6e3e9ca887b685344351a (diff)
downloadpleroma-f378e93bf4ca4bc9547f242e76e6258e25852972.tar.gz
AccountController: Return scope in proper format.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/api_spec/operations/account_operation.ex4
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/account_controller.ex2
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/api_spec/operations/account_operation.ex b/lib/pleroma/web/api_spec/operations/account_operation.ex
index 9bde8fc0d..d94dae374 100644
--- a/lib/pleroma/web/api_spec/operations/account_operation.ex
+++ b/lib/pleroma/web/api_spec/operations/account_operation.ex
@@ -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"
}
}
diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
index 7a88a847c..a87dddddf 100644
--- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex
@@ -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