diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-09 11:26:10 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-10-09 11:26:10 -0500 |
| commit | 04b514c567aa664d2606313d17be69e665a7f1af (patch) | |
| tree | 13f46fd39d8a90837b031b1081b7e20696d6823a /lib/pleroma/web/oauth/oauth_controller.ex | |
| parent | 55562ca9362d66553ea3638c91174bbeb6c637f1 (diff) | |
| parent | d239bd3ca4348d38c12ab54c7e2e9cb2b825cc3c (diff) | |
| download | pleroma-04b514c567aa664d2606313d17be69e665a7f1af.tar.gz | |
Merge branch 'develop' into feature/gen-magic
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 26e68be42..a4152e840 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -119,7 +119,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do redirect_uri = redirect_uri(conn, redirect_uri) url_params = %{access_token: token.token} url_params = Maps.put_if_present(url_params, :state, params["state"]) - url = UriHelper.append_uri_params(redirect_uri, url_params) + url = UriHelper.modify_uri_params(redirect_uri, url_params) redirect(conn, external: url) else conn @@ -161,7 +161,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do redirect_uri = redirect_uri(conn, redirect_uri) url_params = %{code: auth.token} url_params = Maps.put_if_present(url_params, :state, auth_attrs["state"]) - url = UriHelper.append_uri_params(redirect_uri, url_params) + url = UriHelper.modify_uri_params(redirect_uri, url_params) redirect(conn, external: url) else conn |