Merge pull request #50 from kiloutyg/49-bug-where-the-account-creatio…

…n-disappears bug fixed with control in the account service, added required to each…
kiloutyg · Feb 1, 2024 · 7ac2d47 · 7ac2d47
2 parents bbfae0d + a4595ac
commit 7ac2d47
Show file tree

Hide file tree

Showing 8 changed files with 89 additions and 42 deletions.
diff --git a/assets/controllers/hello_controller.js b/assets/controllers/hello_controller.js
diff --git a/assets/controllers/username_validation_controller.js b/assets/controllers/username_validation_controller.js
@@ -0,0 +1,17 @@
+import { Controller } from '@hotwired/stimulus';
+
+export default class extends Controller {
+    static targets = ["username", "message"];
+
+    validateUsername() {
+        const regex = /^[a-zA-Z]+\.[a-zA-Z]+$/;
+        const isValid = regex.test(this.usernameTarget.value);
+
+        if (isValid) {
+            this.messageTarget.textContent = "";
+        } else {
+            this.messageTarget.textContent = "Format invalide. Veuillez saisir sous la forme prénom.nom.";
+            this.messageTarget.style.color = "red"; // Display the message in red color.
+        }
+    }
+}
diff --git a/src/Controller/AccountController.php b/src/Controller/AccountController.php
@@ -34,16 +34,16 @@ public function createAccount(Request $request): Response
                 $this->addFlash('danger', 'Le compte ne peut être créé');
                 return $this->redirectToRoute('app_base');
             }
-            $error = null;
-            $result = $this->accountService->createAccount(
-                $request,
-                $error
-            );
-            if ($result) {
-                $this->addFlash('success', 'Le compte a bien été créé.');
-            }
-            if ($error) {
-                $this->addFlash('error', $error);
+            try {
+                $result = $this->accountService->createAccount($request);
+                if ($result) {
+                    $this->addFlash('success', 'Le compte a bien été créé.');
+                }
+            } catch (\Exception $e) {
+                // Catch and handle the exception.
+                // Log it, add a flash message, etc.
+                $error = $e->getMessage();
+                $this->addFlash('danger', $error);
             }
             return $this->redirectToRoute('app_base');
         }
@@ -95,4 +95,4 @@ public function delete_account_basic(int $userId): Response
             return $this->redirectToRoute('app_base');
         }
     }
-}
+}
diff --git a/src/Entity/User.php b/src/Entity/User.php
@@ -3,10 +3,14 @@
 namespace App\Entity;
 
 use App\Repository\UserRepository;
+
 use Doctrine\ORM\Mapping as ORM;
+
 use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 
+use Symfony\Component\Validator\Constraints as Assert;
+
 #[ORM\Entity(repositoryClass: UserRepository::class)]
 class User implements UserInterface, PasswordAuthenticatedUserInterface
 {
@@ -16,6 +20,9 @@ class User implements UserInterface, PasswordAuthenticatedUserInterface
     private ?int $id = null;
 
     #[ORM\Column(length: 180, unique: true)]
+    #[Assert\NotBlank]
+    #[Assert\Length(min: 3, max: 180)]
+    #[Assert\Regex(pattern: '/^[a-zA-Z]+\.[a-zA-Z]+$/', message: 'Le nom d\'utilisateur doit être au format prénom.nom')]
     private ?string $username = null;
 
     #[ORM\Column]
@@ -71,6 +78,7 @@ public function getRoles(): array
 
     public function setRoles(array $roles): static
     {
+
         $this->roles = $roles;
 
         return $this;
@@ -111,4 +119,4 @@ public function setEmailAddress(?string $emailAddress): static
 
         return $this;
     }
-}
+}
diff --git a/src/Service/AccountService.php b/src/Service/AccountService.php
@@ -3,6 +3,9 @@
 namespace App\Service;
 
 use Doctrine\ORM\EntityManagerInterface;
+
+use Psr\Log\LoggerInterface;
+
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
@@ -20,29 +23,40 @@ class AccountService
     private $userRepository;
     private $manager;
     private $entityDeletionService;
+    private $logger;
 
     public function __construct(
         UserPasswordHasherInterface $passwordHasher,
         UserRepository $userRepository,
         EntityManagerInterface $manager,
-        EntityDeletionService $entityDeletionService
+        EntityDeletionService $entityDeletionService,
+        LoggerInterface $logger
     ) {
         $this->passwordHasher = $passwordHasher;
         $this->userRepository = $userRepository;
         $this->manager = $manager;
         $this->entityDeletionService = $entityDeletionService;
+        $this->logger = $logger;
     }
 
     // This function is responsible for creating a new user account and persisting it to the database
-    public function createAccount(Request $request, $error)
+    public function createAccount(Request $request)
     {
+        $this->logger->info('full request: ' . json_encode($request->request->all()));
         if ($request->getMethod() == 'POST') {
             $name = $request->request->get('username');
             $password = $request->request->get('password');
-            $role = $request->request->get('role');
             $emailAddress = $request->request->get('emailAddress');
 
+            if ($request->request->get('role') == '') {
+                $role = 'ROLE_USER';
+            } else {
+                $role = $request->request->get('role');
+            };
 
+            if ($role == 'ROLE_ADMIN' && $password == '') {
+                throw new \Exception('Le mot de passe ne peut pas être vide.');
+            }
             // check if the username is already in use
             $user = $this->userRepository->findOneBy(['username' => $name]);
             if ($user) {
@@ -152,4 +166,4 @@ public function updateUserEmail(User $user)
         $this->manager->flush();
         return;
     }
-}
+}
diff --git a/templates/services/admin_services/accountservices/create_account.html.twig b/templates/services/admin_services/accountservices/create_account.html.twig
@@ -28,8 +28,19 @@
 								Nom d'utilisateur
 
 							</label>
-							<input type="text" name="username" placeholder="prenom.nom" required class="form-control" id="username">
-						</div>
+							<div data-controller="username-validation">
+								<input type="text" 
+										class="form-control"
+										data-username-validation-target="username" 
+										data-action="keyup->username-validation#validateUsername" 
+										placeholder="prénom.nom"
+										id="username"
+										name="username"
+										required>
+
+								<div data-username-validation-target="message" 
+									class="username-message"></div>
+							</div>						</div>
 						<div class="form-control mb-3">
 							<label for="emailAddress">
 								Adresse Mail

diff --git a/templates/services/admin_services/accountservices/role_affectation.html.twig b/templates/services/admin_services/accountservices/role_affectation.html.twig
@@ -2,8 +2,8 @@
 
 	<div>
 		<label>Selectionnez le role du nouveau compte:</label>
-		<select class="form-control " required name="role" id="role">
-			<option value="">--Choisissez un role--</option>
+		<select class="form-control "  required name="role" id="role">
+			<option value="" disabled selected>--Choisissez un role--</option>
 			<option value="ROLE_SUPER_ADMIN">Super Admin</option>
 		</select>
 	</div>
@@ -12,7 +12,7 @@
 	<div>
 		<label>Selectionnez le role du nouveau compte:</label>
 		<select class="form-control " required name="role" id="role">
-			<option value="">--Choisissez un role--</option>
+			<option value="" disabled selected>--Choisissez un role--</option>
 			<option value="ROLE_ADMIN">Administrateur</option>
 			<option value="ROLE_USER">User</option>
 		</select>
@@ -21,9 +21,9 @@
 {% elseif is_granted('ROLE_ADMIN') %}
 	<div>
 		<label>Selectionnez le role du nouveau compte:</label>
-		<select class="form-control " name="role" id="role">
-			<option value="">--Choisissez un role--</option>
-			<option value="ROLE_USER">User</option>
+		<select class="form-control "  required name="role" id="role">
+			<option value="" disabled selected >--Choisissez un role--</option>
+			<option value="ROLE_USER" selected>User</option>
 		</select>
 	</div>
 {% endif %}
diff --git a/templates/services/admin_services/accountservices/superadmin_create_account.html.twig b/templates/services/admin_services/accountservices/superadmin_create_account.html.twig
@@ -28,14 +28,27 @@
 								Nom d'utilisateur
 
 							</label>
-							<input type="text" name="username" placeholder="prenom.nom" required class="form-control" id="username">
+							<div data-controller="username-validation">
+								<input type="text" 
+										class="form-control"
+										data-username-validation-target="username" 
+										data-action="keyup->username-validation#validateUsername" 
+										placeholder="prénom.nom"
+										id="username"
+										name="username"
+										required>
+
+								<div data-username-validation-target="message" 
+									class="username-message"></div>
+							</div>
+
 						</div>
 						<div class="form-control mb-3">
 							<label for="floatingPassword">
 								Mot de passe
 
 							</label>
-							<input type="password" id="floatingPassword" placeholder="Mot de passe" name="password" required class="form-control">
+							<input type="password" id="floatingPassword" placeholder="Mot de passe" name="password" class="form-control">
 						</div>
 						<div class="form-control mb-3">
 							<label for="emailAddress">