projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'weblate-pleroma-pleroma' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
auth
/
ldap_authenticator.ex
diff --git
a/lib/pleroma/web/auth/ldap_authenticator.ex
b/lib/pleroma/web/auth/ldap_authenticator.ex
index f667da68b90fa726a04c84c8e0ec41cdcf878455..402ab428b5244413727dd9eeb80a71320fc7bdc2 100644
(file)
--- a/
lib/pleroma/web/auth/ldap_authenticator.ex
+++ b/
lib/pleroma/web/auth/ldap_authenticator.ex
@@
-103,14
+103,20
@@
defmodule Pleroma.Web.Auth.LDAPAuthenticator do
{:scope, :eldap.wholeSubtree()},
{:timeout, @search_timeout}
]) do
{:scope, :eldap.wholeSubtree()},
{:timeout, @search_timeout}
]) do
- {:ok, {:eldap_search_result, [{:eldap_entry, _,
_
}], _}} ->
+ {:ok, {:eldap_search_result, [{:eldap_entry, _,
attributes
}], _}} ->
params = %{
name: name,
nickname: name,
password: nil
}
params = %{
name: name,
nickname: name,
password: nil
}
- changeset = User.register_changeset(%User{}, params)
+ params =
+ case List.keyfind(attributes, 'mail', 0) do
+ {_, [mail]} -> Map.put_new(params, :email, :erlang.list_to_binary(mail))
+ _ -> params
+ end
+
+ changeset = User.register_changeset_ldap(%User{}, params)
case User.register(changeset) do
{:ok, user} -> user
case User.register(changeset) do
{:ok, user} -> user