logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: fd12e585c98d4cd2cca45f8ff2c368e80d21e111
parent: 1d3d66a841253a244e5166726ba4f3d1f21651c3
Author: Roger Braun <roger@rogerbraun.net>
Date:   Fri, 10 Nov 2017 18:24:50 +0100

Handle existing redirect params.

Diffstat:

Mlib/pleroma/web/oauth/oauth_controller.ex3++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex @@ -25,7 +25,8 @@ defmodule Pleroma.Web.OAuth.OAuthController do auth: auth } else - url = "#{redirect_uri}?code=#{auth.token}" + connector = if String.contains?(redirect_uri, "?"), do: "&", else: "?" + url = "#{redirect_uri}#{connector}code=#{auth.token}" url = if params["state"] do url <> "&state=#{params["state"]}" else