X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Foauth%2Foauth_controller.ex;h=3e66c3ee8737f332cd9b182de7ad9e24acb0285e;hb=b4f055b60416986220d905bbf688f8417cd8a270;hp=4672ce00ef9da24c3a4bafccaf926b7a06247842;hpb=5fe9e4dd3feaeea9e35c3ef126e8c3b0ee8601a6;p=akkoma diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 4672ce00e..3e66c3ee8 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -10,11 +10,12 @@ defmodule Pleroma.Web.OAuth.OAuthController do response_type: params["response_type"], client_id: params["client_id"], scope: params["scope"], - redirect_uri: params["redirect_uri"] + redirect_uri: params["redirect_uri"], + state: params["state"] } end - def create_authorization(conn, %{"authorization" => %{"name" => name, "password" => password, "client_id" => client_id, "redirect_uri" => redirect_uri}} = params) do + def create_authorization(conn, %{"authorization" => %{"name" => name, "password" => password, "client_id" => client_id, "redirect_uri" => redirect_uri} = params}) do with %User{} = user <- User.get_cached_by_nickname(name), true <- Pbkdf2.checkpw(password, user.password_hash), %App{} = app <- Repo.get_by(App, client_id: client_id), @@ -25,6 +26,11 @@ defmodule Pleroma.Web.OAuth.OAuthController do } else url = "#{redirect_uri}?code=#{auth.token}" + url = if params["state"] do + url <> "&state=#{params["state"]}" + else + url + end redirect(conn, external: url) end end