diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-06-30 15:09:03 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-06-30 15:09:03 -0500 |
| commit | 0883a706dc376fdfb7de9df1366803e87c8e7c98 (patch) | |
| tree | dc43f7b09dddd3300efd7b3ebbc0e82e60a978c5 /lib/pleroma/web/oauth/oauth_controller.ex | |
| parent | 954acdda2072cac343409b3d17d831b86ac6a18c (diff) | |
| parent | b9e6ad571ac5925431466d6e6b27c0b372bb7727 (diff) | |
| download | pleroma-0883a706dc376fdfb7de9df1366803e87c8e7c98.tar.gz | |
Merge branch 'develop' into activation-meta
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/oauth_controller.ex | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 7c804233c..c557778ca 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -6,6 +6,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do use Pleroma.Web, :controller alias Pleroma.Helpers.UriHelper + alias Pleroma.Maps alias Pleroma.MFA alias Pleroma.Plugs.RateLimiter alias Pleroma.Registration @@ -108,7 +109,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do if redirect_uri in String.split(app.redirect_uris) do redirect_uri = redirect_uri(conn, redirect_uri) url_params = %{access_token: token.token} - url_params = UriHelper.append_param_if_present(url_params, :state, params["state"]) + url_params = Maps.put_if_present(url_params, :state, params["state"]) url = UriHelper.append_uri_params(redirect_uri, url_params) redirect(conn, external: url) else @@ -147,7 +148,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do if redirect_uri in String.split(app.redirect_uris) do redirect_uri = redirect_uri(conn, redirect_uri) url_params = %{code: auth.token} - url_params = UriHelper.append_param_if_present(url_params, :state, auth_attrs["state"]) + url_params = Maps.put_if_present(url_params, :state, auth_attrs["state"]) url = UriHelper.append_uri_params(redirect_uri, url_params) redirect(conn, external: url) else |