From 4894b88b1b40705e8d5236d4b417ce2791e3b8fd Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 14 Jun 2018 01:45:10 +0000 Subject: [PATCH] oauth: support either name or username parameter with grant_type=password closes #180 --- lib/pleroma/web/oauth/oauth_controller.ex | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 3dd87d0ab..cdfae8b6a 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -81,7 +81,7 @@ def token_exchange(conn, %{"grant_type" => "authorization_code"} = params) do # - investigate a way to verify the user wants to grant read/write/follow once scope handling is done def token_exchange( conn, - %{"grant_type" => "password", "name" => name, "password" => password} = params + %{"grant_type" => "password", "username" => name, "password" => password} = params ) do with %App{} = app <- get_app_from_request(conn, params), %User{} = user <- User.get_cached_by_nickname(name), @@ -104,6 +104,18 @@ def token_exchange( end end + def token_exchange( + conn, + %{"grant_type" => "password", "name" => name, "password" => password} = params + ) do + params = + params + |> Map.delete("name") + |> Map.put("username", name) + + token_exchange(conn, params) + end + defp fix_padding(token) do token |> Base.url_decode64!(padding: false)