Joururi/spellsaurus
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Fixed an error with 200 codes and translated API errors

Browse Source
This commit is contained in:
Alexis
2020-12-23 18:10:02 +01:00
parent 20f946a945
commit fdad47e84e
1 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
api/repositories/user-repository.js
View File

@@ -31,7 +31,7 @@ class UserRepository {
}) })
.catch(() => { .catch(() => {
reject({ reject({
"message": "Database error, couldn't get all users.", "message": "Erreur de base de données, les utilisateurs n'ont pas pu être récupérés.",
"code": 500 "code": 500
}) })
}) })
@@ -48,7 +48,7 @@ class UserRepository {
}) })
.catch(err => { .catch(err => {
reject({ reject({
"message": "User with this UUID was not found.", "message": "L'utilisateur avec cet UUID n'a pas été trouvé.",
"code": 404 "code": 404
}) })
}) })
@@ -65,7 +65,7 @@ class UserRepository {
}) })
.catch(() => { .catch(() => {
reject({ reject({
"message": "User with this email was not found.", "message": "L'utilisateur avec cet email n'a pas été trouvé.",
"code": 404 "code": 404
}) })
}) })
@@ -77,17 +77,17 @@ class UserRepository {
// Checks if body exists and if the model fits, and throws errors if it doesn't // Checks if body exists and if the model fits, and throws errors if it doesn't
if (isEmptyObject(u)) { if (isEmptyObject(u)) {
reject({ reject({
"message": "Request body cannot be empty.", "message": "Le corps de requête ne peut être vide.",
"code": 403 "code": 403
}) })
} else if (!v.validate(u, UserValidation).valid) { } else if (!v.validate(u, UserValidation).valid) {
reject({ reject({
"message": "Schema is not valid - " + v.validate(u, UserValidation).errors, "message": "Structure de la requête invalide - " + v.validate(u, UserValidation).errors,
"code": 403 "code": 403
}) })
} else if (isXSSAttempt(u.name) || isXSSAttempt(u.password) || isXSSAttempt(u.mail)) { } else if (isXSSAttempt(u.name) || isXSSAttempt(u.password) || isXSSAttempt(u.mail)) {
reject({ reject({
"message": "Injection attempt detected, aborting the request.", "message": "Essai d'injection détecté, avortement de la requête.",
"code": 403 "code": 403
}) })
} else { } else {
@@ -115,14 +115,14 @@ class UserRepository {
}) })
.then(newUser => { .then(newUser => {
resolve({ resolve({
"message": "Account successfully created !", "message": `Compte utilisateur #${newUser.id} créé avec succès.`,
"code": 201, "code": 201,
"user": newUser, "user": newUser,
}) })
}) })
.catch(err => { .catch(err => {
resolve({ resolve({
"message": "An error has occured while creating your account.", "message": "Une erreur s'est produite en créant votre compte. Veuillez réessayer ultérieurement ou contactez l'administrateur.",
"code": 500, "code": 500,
}) })
}) })
@@ -146,13 +146,13 @@ class UserRepository {
if (match) { if (match) {
resolve({ resolve({
"message": "User successfully logged in !", "message": `L'utilisateur #${fetchedUser.id} s'est connecté.`,
"code": 200, "code": 200,
"user": fetchedUser, "user": fetchedUser,
}) })
} else { } else {
reject({ reject({
"message": "Authentification attempt failed ; credentials are incorrect.", "message": "Les informations de connexions sont erronées.",
"code": 400, "code": 400,
}) })
} }
@@ -169,23 +169,21 @@ class UserRepository {
if (!this.validateEmail(mail)) { if (!this.validateEmail(mail)) {
reject({ reject({
"message": "The request isn't a correctly formed email.", "message": "La requête n'est pas un email valide.",
"code": 400, "code": 400,
}) })
} }
this.getOneByEmail(mail, false) this.getOneByEmail(mail, false)
.then(() => { .then(() => {
resolve({ reject({
"message": "This email is already linked to an account.", "message": "Cet email est déjà lié à un compte.",
"available": false, "code": 409
"code": 200
}) })
}) })
.catch(() => { .catch(() => {
resolve({ resolve({
"message": "This email is available.", "message": "Cet email est disponible.",
"available": true,
"code": 200 "code": 200
}) })
}) })