summaryrefslogtreecommitdiff
path: root/lib/pleroma/web/oauth/oauth_controller.ex
diff options
context:
space:
mode:
authorrinpatch <rinpatch@sdf.org>2020-09-17 19:09:10 +0000
committerrinpatch <rinpatch@sdf.org>2020-09-17 19:09:10 +0000
commita0f5e8b27edbe2224d9c2c3997ad5b8ea484244b (patch)
tree4a7a0f02e5880b7dff3ac20eaf59d71c7b584e5e /lib/pleroma/web/oauth/oauth_controller.ex
parent425324aae3d4534bc045466a1cc15653ddfa27d2 (diff)
parent34afc2b0745b39861d9381e69cdb4b9c158f86ee (diff)
Merge branch 'release/2.1.2' into 'stable'v2.1.2
Release/2.1.2 See merge request pleroma/secteam/pleroma!17
Diffstat (limited to 'lib/pleroma/web/oauth/oauth_controller.ex')
-rw-r--r--lib/pleroma/web/oauth/oauth_controller.ex5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
index dd00600ea..06b116368 100644
--- 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
- 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, %{