projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest...
[akkoma]
/
lib
/
pleroma
/
web
/
auth
/
authenticator.ex
diff --git
a/lib/pleroma/web/auth/authenticator.ex
b/lib/pleroma/web/auth/authenticator.ex
index bb87b323c35485809c341b8b9fd79e361078d3a5..b02f595dceaabe01424be5bba6d396f33e2e49ec 100644
(file)
--- a/
lib/pleroma/web/auth/authenticator.ex
+++ b/
lib/pleroma/web/auth/authenticator.ex
@@
-3,8
+3,8
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Auth.Authenticator do
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Auth.Authenticator do
- alias Pleroma.User
alias Pleroma.Registration
alias Pleroma.Registration
+ alias Pleroma.User
def implementation do
Pleroma.Config.get(
def implementation do
Pleroma.Config.get(
@@
-13,30
+13,33
@@
defmodule Pleroma.Web.Auth.Authenticator do
)
end
)
end
- @callback get_user(Plug.Conn.t()
, Map.t()
) :: {:ok, User.t()} | {:error, any()}
- def get_user(plug
, params), do: implementation().get_user(plug, params
)
+ @callback get_user(Plug.Conn.t()) :: {:ok, User.t()} | {:error, any()}
+ def get_user(plug
), do: implementation().get_user(plug
)
- @callback create_from_registration(Plug.Conn.t(),
Map.t(),
Registration.t()) ::
+ @callback create_from_registration(Plug.Conn.t(), Registration.t()) ::
{:ok, User.t()} | {:error, any()}
{:ok, User.t()} | {:error, any()}
- def create_from_registration(plug,
params,
registration),
- do: implementation().create_from_registration(plug,
params,
registration)
+ def create_from_registration(plug, registration),
+ do: implementation().create_from_registration(plug, registration)
- @callback get_registration(Plug.Conn.t()
, Map.t()
) ::
+ @callback get_registration(Plug.Conn.t()) ::
{:ok, Registration.t()} | {:error, any()}
{:ok, Registration.t()} | {:error, any()}
- def get_registration(plug, params),
- do: implementation().get_registration(plug, params)
+ def get_registration(plug), do: implementation().get_registration(plug)
@callback handle_error(Plug.Conn.t(), any()) :: any()
@callback handle_error(Plug.Conn.t(), any()) :: any()
- def handle_error(plug, error), do: implementation().handle_error(plug, error)
+ def handle_error(plug, error),
+ do: implementation().handle_error(plug, error)
@callback auth_template() :: String.t() | nil
def auth_template do
@callback auth_template() :: String.t() | nil
def auth_template do
- implementation().auth_template() || Pleroma.Config.get(:auth_template, "show.html")
+ # Note: `config :pleroma, :auth_template, "..."` support is deprecated
+ implementation().auth_template() ||
+ Pleroma.Config.get([:auth, :auth_template], Pleroma.Config.get(:auth_template)) ||
+ "show.html"
end
@callback oauth_consumer_template() :: String.t() | nil
def oauth_consumer_template do
implementation().oauth_consumer_template() ||
end
@callback oauth_consumer_template() :: String.t() | nil
def oauth_consumer_template do
implementation().oauth_consumer_template() ||
- Pleroma.Config.get(
:oauth_consumer_template
, "consumer.html")
+ Pleroma.Config.get(
[:auth, :oauth_consumer_template]
, "consumer.html")
end
end
end
end