From 3d5cc441c52eb44b3b3c0c2766a99e13183c9daf Mon Sep 17 00:00:00 2001 From: niladic Date: Tue, 22 Oct 2024 08:53:01 +0200 Subject: [PATCH] fixes --- README.md | 5 +++-- app/services/PasswordService.scala | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index f7b55791..15b612b1 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,8 @@ http://localhost:9000 - Les commandes pour le frontend sont dans `package.json` : `npm run watch` (dev), `npm run clean` (supprime ce qui a été installé par `npm install`), `npm run build` (bundle prod) --> - ## Attribution -Le projet inclut le fichier `data/french_passwords_top20000.txt` sous licence [Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/) provenant du dépôt [tarraschk/richelieu](https://github.com/tarraschk/richelieu). +Le projet inclut le fichier `data/french_passwords_top20000.txt` sous licence +[Creative Commons Attribution 4.0 International](https://creativecommons.org/licenses/by/4.0/) +provenant du dépôt [tarraschk/richelieu](https://github.com/tarraschk/richelieu). diff --git a/app/services/PasswordService.scala b/app/services/PasswordService.scala index b4cedb0f..5a939397 100644 --- a/app/services/PasswordService.scala +++ b/app/services/PasswordService.scala @@ -44,8 +44,8 @@ class PasswordService @Inject() ( "used", ) - private val passwordFieldsInSelect: String = - passwordTableFields.mkString(", ") + private val qualifiedPasswordFieldsInSelect: String = + passwordTableFields.map(field => s"password.$field").mkString(", ") private val passwordRecoveryTokenFieldsInSelect: String = passwordRecoveryTokenTableFields.mkString(", ") @@ -259,7 +259,7 @@ class PasswordService @Inject() ( "Impossible de vérifier le mot de passe", ) { implicit connection => SQL( - s"""SELECT $passwordFieldsInSelect + s"""SELECT $qualifiedPasswordFieldsInSelect FROM "user", password WHERE "user".id = password.user_id AND email = {email}