From b1ba26e0b99ca1ad1444a30657d10b4cd75ab870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Sun, 1 Dec 2024 23:05:27 +0100
Subject: [PATCH] Allow usernames to contain @-signs as long as it is not at
 the begininng

This allows to use email addresses as usernames and fixes issue #772
---
 src/Entity/UserSystem/User.php | 2 +-
 translations/validators.de.xlf | 2 +-
 translations/validators.en.xlf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Entity/UserSystem/User.php b/src/Entity/UserSystem/User.php
index b5dd6064..f46dfd15 100644
--- a/src/Entity/UserSystem/User.php
+++ b/src/Entity/UserSystem/User.php
@@ -256,7 +256,7 @@ class User extends AttachmentContainingDBElement implements UserInterface, HasPe
     protected ?string $password = null;
 
     #[Assert\NotBlank]
-    #[Assert\Regex('/^[\w\.\+\-\$]+$/', message: 'user.invalid_username')]
+    #[Assert\Regex('/^[\w\.\+\-\$]+[\w\.\+\-\$\@]*$/', message: 'user.invalid_username')]
     #[Groups(['user:read'])]
     protected string $name = '';
 
diff --git a/translations/validators.de.xlf b/translations/validators.de.xlf
index e9a3f0e9..dc3f94df 100644
--- a/translations/validators.de.xlf
+++ b/translations/validators.de.xlf
@@ -164,7 +164,7 @@
       </notes>
       <segment state="translated">
         <source>user.invalid_username</source>
-        <target>Der Benutzername darf nur Buchstaben, Zahlen, Unterstriche, Punkte, Plus- oder Minuszeichen enthalten.</target>
+        <target>Der Benutzername darf nur Buchstaben, Zahlen, Unterstriche, Punkte, Plus- oder Minuszeichen enthalten und darf nicht mit einem @ beginnen.</target>
       </segment>
     </unit>
     <unit id="_v.DMg." name="validator.noneofitschild.self">
diff --git a/translations/validators.en.xlf b/translations/validators.en.xlf
index 3e23ccac..95a633e2 100644
--- a/translations/validators.en.xlf
+++ b/translations/validators.en.xlf
@@ -164,7 +164,7 @@
       </notes>
       <segment state="translated">
         <source>user.invalid_username</source>
-        <target>The username must contain only letters, numbers, underscores, dots, pluses or minuses!</target>
+        <target>The username must contain only letters, numbers, underscores, dots, pluses or minuses and must not begin with an @!</target>
       </segment>
     </unit>
     <unit id="_v.DMg." name="validator.noneofitschild.self">