mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 16:40:29 +00:00
Code Issues Projects Releases Wiki Activity

[#2130] Fixed OAuth OOB authentication for users with enabled MFA.

Browse source
This commit is contained in:
Ivan Tashkinov 2020-09-09 22:44:38 +03:00
parent 9d20d29a79
commit cad69669fc
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/web/oauth/oauth_controller.ex
View file

@ -145,7 +145,10 @@ defmodule Pleroma.Web.OAuth.OAuthController do
def after_create_authorization(%Plug.Conn{} = conn, %Authorization{} = auth, %{ def after_create_authorization(%Plug.Conn{} = conn, %Authorization{} = auth, %{
"authorization" => %{"redirect_uri" => @oob_token_redirect_uri} "authorization" => %{"redirect_uri" => @oob_token_redirect_uri}
}) do }) 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 end
def after_create_authorization(%Plug.Conn{} = conn, %Authorization{} = auth, %{ def after_create_authorization(%Plug.Conn{} = conn, %Authorization{} = auth, %{

2
lib/pleroma/web/templates/o_auth/o_auth/oob_authorization_created.html.eex
View file

@ -1,2 +1,2 @@
<h1>Successfully authorized</h1> <h1>Successfully authorized</h1>
<h2>Token code is <%= @auth.token %></h2> <h2>Token code is <br><%= @auth.token %></h2>

2
lib/pleroma/web/templates/o_auth/o_auth/oob_token_exists.html.eex
View file

@ -1,2 +1,2 @@
<h1>Authorization exists</h1> <h1>Authorization exists</h1>
<h2>Access token is <%= @token.token %></h2> <h2>Access token is <br><%= @token.token %></h2>