pleroma

commit: 2c303b3302e28a85aec448a9d57f9c5b1e658bfb
parent: 280ac243aa8593cf5e16a96a0a887f5cbfce50d0
Author: lambda <pleromagit@rogerbraun.net>
Date:   Thu, 14 Jun 2018 07:14:18 +0000

Merge branch 'bugfix/oauth2-param-name' into 'develop'

oauth: support either name or username parameter with grant_type=password

Closes #180

See merge request pleroma/pleroma!219
Diffstat:
M
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
@@ -81,7 +81,7 @@ defmodule Pleroma.Web.OAuth.OAuthController 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_by_nickname_or_email(name),
@@ -104,6 +104,18 @@ defmodule Pleroma.Web.OAuth.OAuthController do
     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)