moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix code mistake in OAuth controller

This commit is contained in:
Sean King 2021-06-04 14:50:16 -06:00
parent dc4814f0cd
commit 839c2c6a12
No known key found for this signature in database
GPG Key ID: 510C52BACD6E7257
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pleroma/web/o_auth/o_auth_controller.ex
View File

@ -599,13 +599,7 @@ def login(%User{} = user, %App{} = app, requested_scopes) when is_list(requested
{: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)