diff options
| author | Sean King <seanking2919@protonmail.com> | 2021-06-04 14:50:16 -0600 |
|---|---|---|
| committer | Sean King <seanking2919@protonmail.com> | 2021-06-04 14:50:16 -0600 |
| commit | 839c2c6a12d2b7695028baca54c2a4512a5a92a2 (patch) | |
| tree | adf6c7d3073ed598da6b165d22a9ad523d4d24dc /lib | |
| parent | dc4814f0cdc12a552001e5e22c979060e4f3f865 (diff) | |
| download | pleroma-839c2c6a12d2b7695028baca54c2a4512a5a92a2.tar.gz | |
Fix code mistake in OAuth controller
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/o_auth/o_auth_controller.ex | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/pleroma/web/o_auth/o_auth_controller.ex b/lib/pleroma/web/o_auth/o_auth_controller.ex index 73d485497..30c2ad825 100644 --- a/lib/pleroma/web/o_auth/o_auth_controller.ex +++ b/lib/pleroma/web/o_auth/o_auth_controller.ex @@ -599,13 +599,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do {:ok, token} end end - -<<<<<<< HEAD -======= - # Special case: Local MastodonFE - defp redirect_uri(%Plug.Conn{} = conn, "."), do: Routes.auth_url(conn, :login) - ->>>>>>> 0c56f9de0d607b88fd107e0bd13ef286f0629346 + defp redirect_uri(%Plug.Conn{}, redirect_uri), do: redirect_uri defp get_session_registration_id(%Plug.Conn{} = conn), do: get_session(conn, :registration_id) |