diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-03-02 06:39:07 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-03-02 06:39:07 +0000 |
| commit | f38c316e6edbc88f1808a0c39488231ce17e4f35 (patch) | |
| tree | b9375def5691dd3a5b86ba9ce3f02a506a5de8b3 /lib | |
| parent | b91a6dd85e143b6f1505a53b13b5c9d9ae6cbf8a (diff) | |
| parent | bb9e40968a90b882ba85e71a2622756e40563207 (diff) | |
| download | pleroma-f38c316e6edbc88f1808a0c39488231ce17e4f35.tar.gz | |
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index b16e3b2a7..36318d69b 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -113,7 +113,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do refresh_token: token.refresh_token, created_at: DateTime.to_unix(inserted_at), expires_in: 60 * 10, - scope: Enum.join(token.scopes) + scope: Enum.join(token.scopes, " ") } json(conn, response) |