fix: error on duplicate username/email registration (#1168)

* fix: error on duplicate username/email registration

* Raise 409 http error on duplicate user registration

* Add translation to conflict error messages

* Update lang files

* Remove key in translator parameter

mealie/lang/messages/af-ZA.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/ar-SA.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/ca-ES.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/cs-CZ.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/da-DK.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/de-DE.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/el-GR.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/en-GB.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/en-US.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/es-ES.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/fi-FI.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/fr-CA.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "Ce nom d'utilisateur est déjà pris",
+        "email-conflict-error": "Cet email existe déjà"
     }
 }

mealie/lang/messages/fr-FR.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "Ce nom d'utilisateur est déjà pris",
+        "email-conflict-error": "Cet email existe déjà"
     }
 }

mealie/lang/messages/he-IL.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/hu-HU.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/it-IT.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/ja-JP.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/ko-KR.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/nl-NL.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/no-NO.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/pl-PL.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/pt-BR.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/pt-PT.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/ro-RO.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/ru-RU.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/sk-SK.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/sr-SP.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/sv-SE.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/tr-TR.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/uk-UA.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/vi-VN.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/zh-CN.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/lang/messages/zh-TW.json

@@ -8,6 +8,8 @@
     "exceptions": {
         "permission_denied": "You do not have permission to perform this action",
         "no-entry-found": "The requested resource was not found",
-        "integrity-error": "Database integrity error"
+        "integrity-error": "Database integrity error",
+        "username-conflict-error": "This username is already taken",
+        "email-conflict-error": "This email is already in use"
     }
 }

mealie/services/user_services/registration_service.py

@@ -4,6 +4,7 @@ from uuid import uuid4
 from fastapi import HTTPException, status
 
 from mealie.core.security import hash_password
+from mealie.lang import local_provider
 from mealie.repos.repository_factory import AllRepositories
 from mealie.schema.group.group_preferences import CreateGroupPreferences
 from mealie.schema.user.registration import CreateUserRegistration
@@ -18,6 +19,7 @@ class RegistrationService:
     def __init__(self, logger: Logger, db: AllRepositories):
         self.logger = logger
         self.repos = db
+        self.t = local_provider()
 
     def _create_new_user(self, group: GroupInDB, new_group: bool) -> PrivateUser:
         new_user = UserIn(
@@ -54,6 +56,11 @@ class RegistrationService:
     def register_user(self, registration: CreateUserRegistration) -> PrivateUser:
         self.registration = registration
 
+        if self.repos.users.get_by_username(registration.username):
+            raise HTTPException(status.HTTP_409_CONFLICT, {"message": self.t.t("exceptions.username-conflict-error")})
+        elif self.repos.users.get(registration.email, "email"):
+            raise HTTPException(status.HTTP_409_CONFLICT, {"message": self.t.t("exceptions.email-conflict-error")})
+
         self.logger.info(f"Registering user {registration.username}")
         token_entry = None
         new_group = False