1
0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-12-25 03:15:38 +01:00

Merge branch 'fix/oauth-controller' into 'develop'

Fix OAuthController

Closes #1294

See merge request pleroma/pleroma!1780
This commit is contained in:
lain 2019-10-04 11:27:30 +00:00
commit bc095a27f1

View File

@ -460,7 +460,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do
end
# Special case: Local MastodonFE
defp redirect_uri(%Plug.Conn{} = conn, "."), do: mastodon_api_url(conn, :login)
defp redirect_uri(%Plug.Conn{} = conn, "."), do: auth_url(conn, :login)
defp redirect_uri(%Plug.Conn{}, redirect_uri), do: redirect_uri