From 4e77f68414c1dd6a906d1d9b6b78916db5c213d5 Mon Sep 17 00:00:00 2001 From: Ivan Tashkinov Date: Thu, 28 Feb 2019 13:58:58 +0300 Subject: [PATCH] Added `auth_template/0` to DatabaseAuthenticator. --- lib/pleroma/web/auth/database_authenticator.ex | 5 +++++ lib/pleroma/web/auth/pleroma_database_authenticator.ex | 2 ++ lib/pleroma/web/oauth/oauth_controller.ex | 4 +--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/pleroma/web/auth/database_authenticator.ex b/lib/pleroma/web/auth/database_authenticator.ex index e78068b03..494f28f23 100644 --- a/lib/pleroma/web/auth/database_authenticator.ex +++ b/lib/pleroma/web/auth/database_authenticator.ex @@ -17,4 +17,9 @@ def get_user(plug), do: implementation().get_user(plug) @callback handle_error(Plug.Conn.t(), any()) :: any() def handle_error(plug, error), do: implementation().handle_error(plug, error) + + @callback auth_template() :: String.t() | nil + def auth_template do + implementation().auth_template() || Pleroma.Config.get(:auth_template, "show.html") + end end diff --git a/lib/pleroma/web/auth/pleroma_database_authenticator.ex b/lib/pleroma/web/auth/pleroma_database_authenticator.ex index 39aa1a586..0780388bc 100644 --- a/lib/pleroma/web/auth/pleroma_database_authenticator.ex +++ b/lib/pleroma/web/auth/pleroma_database_authenticator.ex @@ -23,4 +23,6 @@ def get_user(%Plug.Conn{} = conn) do def handle_error(%Plug.Conn{} = _conn, error) do error end + + def auth_template, do: nil end diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex index 5c2b0507c..99346f399 100644 --- a/lib/pleroma/web/oauth/oauth_controller.ex +++ b/lib/pleroma/web/oauth/oauth_controller.ex @@ -25,9 +25,7 @@ def authorize(conn, params) do available_scopes = (app && app.scopes) || [] scopes = oauth_scopes(params, nil) || available_scopes - template = Pleroma.Config.get(:auth_template, "show.html") - - render(conn, template, %{ + render(conn, DatabaseAuthenticator.auth_template(), %{ response_type: params["response_type"], client_id: params["client_id"], available_scopes: available_scopes,