hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix merge conflicts with upstream

Browse source
This commit is contained in:
Sean King 2021-06-04 14:42:44 -06:00
commit dc4814f0cd
No known key found for this signature in database
GPG key ID: 510C52BACD6E7257
240 changed files with 4616 additions and 1584 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -427,7 +427,7 @@ defmodule Pleroma.Web.OAuth.OAuthController do
|> Map.put("state", state)
# Handing the request to Ueberauth
redirect(conn, to: o_auth_path(conn, :request, provider, params))
redirect(conn, to: Routes.o_auth_path(conn, :request, provider, params))
end
def request(%Plug.Conn{} = conn, params) do
@ -600,6 +600,12 @@ defmodule Pleroma.Web.OAuth.OAuthController do
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)

1
lib/pleroma/web/o_auth/o_auth_view.ex
View file

@ -10,6 +10,7 @@ defmodule Pleroma.Web.OAuth.OAuthView do
def render("token.json", %{token: token} = opts) do
response = %{
id: token.id,
token_type: "Bearer",
access_token: token.token,
refresh_token: token.refresh_token,