projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge develop
[akkoma]
/
lib
/
pleroma
/
web
/
oauth
/
oauth_controller.ex
diff --git
a/lib/pleroma/web/oauth/oauth_controller.ex
b/lib/pleroma/web/oauth/oauth_controller.ex
index dd00600ea5ce3c7e67450e8706b8fdc0fb2f122f..26e68be428461fb56af9f1aca878dc74e5ef1d98 100644
(file)
--- a/
lib/pleroma/web/oauth/oauth_controller.ex
+++ b/
lib/pleroma/web/oauth/oauth_controller.ex
@@
-145,7
+145,10
@@
defmodule Pleroma.Web.OAuth.OAuthController do
def after_create_authorization(%Plug.Conn{} = conn, %Authorization{} = auth, %{
"authorization" => %{"redirect_uri" => @oob_token_redirect_uri}
}) do
def after_create_authorization(%Plug.Conn{} = conn, %Authorization{} = auth, %{
"authorization" => %{"redirect_uri" => @oob_token_redirect_uri}
}) do
- render(conn, "oob_authorization_created.html", %{auth: auth})
+ # Enforcing the view to reuse the template when calling from other controllers
+ conn
+ |> put_view(OAuthView)
+ |> render("oob_authorization_created.html", %{auth: auth})
end
def after_create_authorization(%Plug.Conn{} = conn, %Authorization{} = auth, %{
end
def after_create_authorization(%Plug.Conn{} = conn, %Authorization{} = auth, %{
@@
-197,7
+200,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
{:mfa_required, user, auth, _},
params
) do
{:mfa_required, user, auth, _},
params
) do
- {:ok, token} = MFA.Token.create
_token
(user, auth)
+ {:ok, token} = MFA.Token.create(user, auth)
data = %{
"mfa_token" => token.token,
data = %{
"mfa_token" => token.token,
@@
-579,7
+582,7
@@
defmodule Pleroma.Web.OAuth.OAuthController do
do: put_session(conn, :registration_id, registration_id)
defp build_and_response_mfa_token(user, auth) do
do: put_session(conn, :registration_id, registration_id)
defp build_and_response_mfa_token(user, auth) do
- with {:ok, token} <- MFA.Token.create
_token
(user, auth) do
+ with {:ok, token} <- MFA.Token.create(user, auth) do
MFAView.render("mfa_response.json", %{token: token, user: user})
end
end
MFAView.render("mfa_response.json", %{token: token, user: user})
end
end