alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/oauth-me' into 'develop' 

oauth: add me property to token responses

See merge request pleroma/pleroma!942
This commit is contained in:
lambda 2019-03-16 08:44:02 +00:00
parent c69dc2acf1 e0edc706cf
commit 28df397454
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pleroma/web/oauth/oauth_controller.ex
View File

@ -104,6 +104,7 @@ def token_exchange(conn, %{"grant_type" => "authorization_code"} = params) do
fixed_token = fix_padding(params["code"]), fixed_token = fix_padding(params["code"]),
%Authorization{} = auth <- %Authorization{} = auth <-
Repo.get_by(Authorization, token: fixed_token, app_id: app.id), Repo.get_by(Authorization, token: fixed_token, app_id: app.id),
%User{} = user <- Repo.get(User, auth.user_id),
{:ok, token} <- Token.exchange_token(app, auth), {:ok, token} <- Token.exchange_token(app, auth),
{:ok, inserted_at} <- DateTime.from_naive(token.inserted_at, "Etc/UTC") do {:ok, inserted_at} <- DateTime.from_naive(token.inserted_at, "Etc/UTC") do
response = %{ response = %{
@ -112,7 +113,8 @@ def token_exchange(conn, %{"grant_type" => "authorization_code"} = params) do
refresh_token: token.refresh_token, refresh_token: token.refresh_token,
created_at: DateTime.to_unix(inserted_at), created_at: DateTime.to_unix(inserted_at),
expires_in: 60 * 10, expires_in: 60 * 10,
scope: Enum.join(token.scopes, " ") scope: Enum.join(token.scopes, " "),
me: user.ap_id
} }
json(conn, response) json(conn, response)
@ -140,7 +142,8 @@ def token_exchange(
access_token: token.token, access_token: token.token,
refresh_token: token.refresh_token, refresh_token: token.refresh_token,
expires_in: 60 * 10, expires_in: 60 * 10,
scope: Enum.join(token.scopes, " ") scope: Enum.join(token.scopes, " "),
me: user.ap_id
} }
json(conn, response) json(conn, response)

3
test/web/oauth/oauth_controller_test.exs
View File

@ -132,11 +132,12 @@ test "issues a token for an all-body request" do
"client_secret" => app.client_secret "client_secret" => app.client_secret
}) })
assert %{"access_token" => token} = json_response(conn, 200) assert %{"access_token" => token, "me" => ap_id} = json_response(conn, 200)
token = Repo.get_by(Token, token: token) token = Repo.get_by(Token, token: token)
assert token assert token
assert token.scopes == auth.scopes assert token.scopes == auth.scopes
assert user.ap_id == ap_id
end end
test "issues a token for `password` grant_type with valid credentials, with full permissions by default" do test "issues a token for `password` grant_type with valid credentials, with full permissions by default" do