diff options
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) |