Merge pull request #4997 from matrix-org/erikj/dinsic_email_display_name

Add config option to use email as display name for new users
This commit is contained in:
Erik Johnston 2019-04-03 10:57:20 +01:00 committed by GitHub
commit d94873d525
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 13 deletions

View file

@ -661,6 +661,11 @@ uploads_path: "DATADIR/uploads"
# #
#register_mxid_from_3pid: email #register_mxid_from_3pid: email
# Uncomment to set the display name of new users to their email address,
# rather than using the default heuristic.
#
#register_just_use_email_for_display_name: true
# Mandate that users are only allowed to associate certain formats of # Mandate that users are only allowed to associate certain formats of
# 3PIDs with accounts on this server. # 3PIDs with accounts on this server.
# #

View file

@ -42,6 +42,9 @@ class RegistrationConfig(Config):
self.registration_shared_secret = config.get("registration_shared_secret") self.registration_shared_secret = config.get("registration_shared_secret")
self.register_mxid_from_3pid = config.get("register_mxid_from_3pid") self.register_mxid_from_3pid = config.get("register_mxid_from_3pid")
self.register_just_use_email_for_display_name = config.get(
"register_just_use_email_for_display_name", False,
)
self.bcrypt_rounds = config.get("bcrypt_rounds", 12) self.bcrypt_rounds = config.get("bcrypt_rounds", 12)
self.trusted_third_party_id_servers = config.get( self.trusted_third_party_id_servers = config.get(
@ -111,6 +114,11 @@ class RegistrationConfig(Config):
# #
#register_mxid_from_3pid: email #register_mxid_from_3pid: email
# Uncomment to set the display name of new users to their email address,
# rather than using the default heuristic.
#
#register_just_use_email_for_display_name: true
# Mandate that users are only allowed to associate certain formats of # Mandate that users are only allowed to associate certain formats of
# 3PIDs with accounts on this server. # 3PIDs with accounts on this server.
# #

View file

@ -454,6 +454,9 @@ class RegisterRestServlet(RestServlet):
# something else went wrong. # something else went wrong.
break break
if self.config.register_just_use_email_for_display_name:
desired_display_name = address
else:
# XXX: a nasty heuristic to turn an email address into # XXX: a nasty heuristic to turn an email address into
# a displayname, as part of register_mxid_from_3pid # a displayname, as part of register_mxid_from_3pid
parts = address.replace('.', ' ').split('@') parts = address.replace('.', ' ').split('@')