fix: allow use of email as username

Fix #942
MAIF · Feb 26, 2025 · 7437abc · 7437abc
1 parent f32d65d
commit 7437abc
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/app/fr/maif/izanami/models/User.scala b/app/fr/maif/izanami/models/User.scala
@@ -442,8 +442,8 @@ object User {
   implicit val rightWrite: Writes[Rights] = Json.writes[Rights]
 
   implicit val userReads: Reads[User] = (
-    (__ \ "username").read[String].filter(name => NAME_REGEXP.pattern.matcher(name).matches()) and
-      (__ \ "email").read[String].filter(name => NAME_REGEXP.pattern.matcher(name).matches()) and
+    (__ \ "username").read[String].filter(name => USERNAME_REGEXP.pattern.matcher(name).matches()) and
+      (__ \ "email").read[String].filter(name => USERNAME_REGEXP.pattern.matcher(name).matches()) and
       (__ \ "password").read[String].filter(name => PASSWORD_REGEXP.pattern.matcher(name).matches()) and
       (__ \ "admin").readWithDefault[Boolean](false) and
       (__ \ "defaultTenant").readNullable[String]
@@ -527,7 +527,7 @@ object User {
     (__ \ "admin").readNullable[Boolean])((rights, admin) => UserRightsUpdateRequest(rights = rights, admin = admin))
 
   implicit val userUpdateReads: Reads[UserInformationUpdateRequest] =
-    ((__ \ "username").read[String].filter(name => NAME_REGEXP.pattern.matcher(name).matches()) and
+    ((__ \ "username").read[String].filter(name => USERNAME_REGEXP.pattern.matcher(name).matches()) and
       (__ \ "email").read[String].filter(Constraints.emailAddress.apply(_) == Valid) and
       (__ \ "defaultTenant").readNullable[String] and
       (__ \ "password").read[String])((name, email, defaultTenant, password) =>

diff --git a/app/fr/maif/izanami/models/package.scala b/app/fr/maif/izanami/models/package.scala
@@ -4,4 +4,5 @@ import scala.util.matching.Regex
 
 package object models {
   val NAME_REGEXP: Regex = "^[a-zA-Z0-9_-]+$".r
+  val USERNAME_REGEXP: Regex = "^[a-zA-Z0-9_\\-!#$%&'*+-/=?^`{|}~@.]+$".r
 }
diff --git a/app/fr/maif/izanami/web/UserController.scala b/app/fr/maif/izanami/web/UserController.scala
@@ -362,7 +362,7 @@ class UserController(
     val result =
       for (
         username    <-
-          (request.body \ "username").asOpt[String].filter(name => NAME_REGEXP.pattern.matcher(name).matches());
+          (request.body \ "username").asOpt[String].filter(name => USERNAME_REGEXP.pattern.matcher(name).matches());
         password    <-
           (request.body \ "password").asOpt[String].filter(name => PASSWORD_REGEXP.pattern.matcher(name).matches());
         token       <- (request.body \ "token").asOpt[String];

diff --git a/izanami-frontend/src/utils/patterns.tsx b/izanami-frontend/src/utils/patterns.tsx
@@ -1,5 +1,6 @@
-export const PASSWORD_REGEXP = /^[a-zA-Z0-9_\-+=;:,?!$%'"^@*<>&|#\/\\()\[\]{}]{8,100}$/;
-export const USERNAME_REGEXP = /^[a-zA-Z0-9_-]+$/;
+export const PASSWORD_REGEXP =
+  /^[a-zA-Z0-9_\-+=;:,?!$%'"^@*<>&|#\/\\()\[\]{}]{8,100}$/;
+export const USERNAME_REGEXP = /^[a-zA-Z0-9_\-!#$%&'*+-/=?^`{|}~@.]+$/;
 export const FEATURE_NAME_REGEXP = /^[ a-zA-Z0-9_\-:]+$/;
 export const TENANT_NAME_REGEXP = /^[a-z0-9-]+$/;
 export const KEY_NAME_REGEXP = /^[a-zA-Z0-9-_]+$/;

diff --git a/test/fr/maif/izanami/api/UsersAPISpec.scala b/test/fr/maif/izanami/api/UsersAPISpec.scala
@@ -60,6 +60,15 @@ class UsersAPISpec extends BaseAPISpec {
       (response.json.get \ "password").asOpt[String] mustBe None
     }
 
+    "allow user creation with mail as username" in {
+      val situation = TestSituationBuilder().loggedInWithAdminRights().build()
+      val response = situation.createUser(user = "[email protected]", password = "12345678")
+
+      response.status mustBe CREATED
+      (response.json.get \ "username").as[String] mustEqual "[email protected]"
+      (response.json.get \ "password").asOpt[String] mustBe None
+    }
+
     "prevent user creation is username or password is too long" in {
       val situation = TestSituationBuilder().loggedInWithAdminRights().build()