Handle existing redirect params.

2017-11-10 18:24:50 +01:00 · 2017-11-10 18:24:50 +01:00 · fd12e585c9
commit fd12e585c9
parent 1d3d66a841
1 changed files with 2 additions and 1 deletions
--- 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