diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-07-09 09:08:59 -0500 |
|---|---|---|
| committer | Mark Felder <feld@FreeBSD.org> | 2020-07-09 09:08:59 -0500 |
| commit | 49c4e2495357797caa82b4eb0a4d03e8c8dd2730 (patch) | |
| tree | 7295ba98c7833534622a9c7fb27580691fbc06a5 /lib/pleroma/web/oauth/mfa_controller.ex | |
| parent | da4029391d217b1e2c151e69479de42e2221e02f (diff) | |
| parent | 8ca1f3e8c61b906387e9cb6fb8993d2ad496ab3d (diff) | |
| download | pleroma-49c4e2495357797caa82b4eb0a4d03e8c8dd2730.tar.gz | |
Merge branch 'develop' into fix/csp-for-captcha
Diffstat (limited to 'lib/pleroma/web/oauth/mfa_controller.ex')
| -rw-r--r-- | lib/pleroma/web/oauth/mfa_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/mfa_controller.ex b/lib/pleroma/web/oauth/mfa_controller.ex index 53e19f82e..f102c93e7 100644 --- a/lib/pleroma/web/oauth/mfa_controller.ex +++ b/lib/pleroma/web/oauth/mfa_controller.ex @@ -13,6 +13,7 @@ defmodule Pleroma.Web.OAuth.MFAController do alias Pleroma.Web.Auth.TOTPAuthenticator alias Pleroma.Web.OAuth.MFAView, as: View alias Pleroma.Web.OAuth.OAuthController + alias Pleroma.Web.OAuth.OAuthView alias Pleroma.Web.OAuth.Token plug(:fetch_session when action in [:show, :verify]) @@ -74,7 +75,7 @@ defmodule Pleroma.Web.OAuth.MFAController do {:ok, %{user: user, authorization: auth}} <- MFA.Token.validate(mfa_token), {:ok, _} <- validates_challenge(user, params), {:ok, token} <- Token.exchange_token(app, auth) do - json(conn, Token.Response.build(user, token)) + json(conn, OAuthView.render("token.json", %{user: user, token: token})) else _error -> conn |