johanleroy/ENI-sortir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflict resolved

Browse Source
This commit is contained in:
Olivier PARPAILLON
2024-11-20 12:53:20 +01:00
parent 40019dff72 6938ae1bd1
commit 48fcc263b5
10 changed files with 185 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -37,5 +37,5 @@ MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
###< symfony/messenger ###
###> symfony/mailer ###
MAILER_DSN=smtp://no-reply@lidge.fr:t7qbPx6C1XDSWbO3XOFf@mail.lidge.fr:587
MAILER_DSN=smtp://leroyjohan3@gmail.com:nfqvxtdxixrtjrmt@smtp.gmail.com:587
###< symfony/mailer ###

2
.idea/php.xml generated
View File

@@ -150,7 +150,7 @@
<path value="$PROJECT_DIR$/vendor/fzaninotto/faker" />
</include_path>
</component>
<component name="PhpProjectSharedConfiguration" php_language_level="8.1" />
<component name="PhpProjectSharedConfiguration" php_language_level="8.2" />
<component name="PhpStanOptionsConfiguration">
<option name="transferred" value="true" />
</component>

1
.idea/sortir.iml generated
View File

@@ -3,6 +3,7 @@
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" packagePrefix="App\" />
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" packagePrefix="App\Tests\" />
<excludeFolder url="file://$MODULE_DIR$/vendor/composer" />
<excludeFolder url="file://$MODULE_DIR$/vendor/doctrine/cache" />

2
composer.json
View File

@@ -4,7 +4,7 @@
"minimum-stability": "stable",
"prefer-stable": true,
"require": {
"php": ">=8.1",
"php": ">=8.2",
"ext-ctype": "*",
"ext-iconv": "*",
"doctrine/dbal": "^3",

2
composer.lock generated
View File

@@ -10273,7 +10273,7 @@
"prefer-stable": true,
"prefer-lowest": false,
"platform": {
"php": ">=8.1",
"php": ">=8.2",
"ext-ctype": "*",
"ext-iconv": "*"
},

1
config/packages/security.yaml
View File

@@ -43,6 +43,7 @@ security:
# Note: Only the *first* access control that matches will be used
access_control:
- { path: ^/login, roles: PUBLIC_ACCESS }
- { path: ^/password, roles: PUBLIC_ACCESS }
- { path: ^/register, roles: PUBLIC_ACCESS }
- { path: ^/admin, roles: ROLE_ADMIN }
- { path: ^/, roles: ROLE_USER }

37
src/Controller/AdminController.php
View File

@@ -3,6 +3,7 @@
namespace App\Controller;
use App\Entity\Participant;
use App\Entity\PasswordResetToken;
use App\Entity\Site;
use App\Entity\Ville;
use App\Repository\ParticipantRepository;
@@ -10,13 +11,14 @@ use App\Repository\SiteRepository;
use App\Repository\VilleRepository;
use Doctrine\ORM\EntityManagerInterface;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
use Symfony\Component\Mailer\MailerInterface;
use Symfony\Component\Mime\Email;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
class AdminController extends AbstractController
{
@@ -85,7 +87,7 @@ class AdminController extends AbstractController
return $this->redirectToRoute('app_adminUser'); // Redirigez vers la liste des utilisateurs
}
#[Route('/admin/user/add', name: 'app_adminUserAdd', methods: ['POST'])]
public function userAdd(Request $request, EntityManagerInterface $entityManager, MailerInterface $mailer): Response
public function userAdd(Request $request, EntityManagerInterface $entityManager, MailerInterface $mailer, UrlGeneratorInterface $urlGenerator): Response
{
try {
// Récupérer les données envoyées par le formulaire
@@ -107,7 +109,6 @@ class AdminController extends AbstractController
return $this->redirectToRoute('app_adminUser');
}
// Créer une nouvelle entité City et définir ses propriétés
$participant = new Participant();
$participant->setNom($nom);
$participant->setPrenom($prenom);
@@ -119,19 +120,36 @@ class AdminController extends AbstractController
$participant->setRoles(['ROLE_USER']);
$participant->setPassword(password_hash("aChanger44!", PASSWORD_BCRYPT));
// Enregistrer la ville dans la base de données
$entityManager->persist($participant);
// Générer un token unique
$token = bin2hex(random_bytes(32));
// Enregistrer le token dans la base de données
$passwordResetToken = new PasswordResetToken();
$passwordResetToken->setToken($token)
->setEmail($participant->getEmail())
->setCreatedAt(new \DateTime());
$entityManager->persist($passwordResetToken);
$entityManager->flush();
// Générer un lien de réinitialisation
$resetLink = $urlGenerator->generate(
'app_password_reset',
['token' => $token],
UrlGeneratorInterface::ABSOLUTE_URL
);
// Envoyer un email de notification
$email = (new Email())
->from('contact@Sortir.com')
->to($mail)
->from('contact@sortir.com')
->to($participant->getEmail())
->subject('Sortir.com | Bienvenue sur notre site !')
->html("
<h1>Bonjour $pseudo,</h1>
<p>Un administrateur du site vous à créé un compte sur <a href='https://localhost:8080' target='_blank'>Sortir.com</a> !</p>
<p>Votre mot de passe temporaire est : <strong>aChanger44!</strong></p>
<p>Un administrateur du site vous a créé un compte !</p>
<p>Terminer la création de cotre compte : <a href='$resetLink' target='_blank'>Sortir.com</a></p>
<p>Toute l'équipe de Sortir vous souhaite la bienvenue !</p>
");
@@ -142,6 +160,9 @@ class AdminController extends AbstractController
} catch(\Exception $e) {
$this->addFlash('error', "Erreur : " . $e->getMessage());
return $this->redirectToRoute('app_adminUser');
} catch (TransportExceptionInterface $e) {
$this->addFlash('error', "Erreur : " . $e->getMessage());
return $this->redirectToRoute('app_adminUser');
}
}
#[Route('/admin/user/import', name: 'participant_import', methods: ['POST'])]

119
src/Controller/PasswordResetController.php Normal file
View File

@@ -0,0 +1,119 @@
<?php
namespace App\Controller;
use App\Entity\Participant;
use App\Entity\PasswordResetToken;
use Doctrine\ORM\EntityManagerInterface;
use Random\RandomException;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
use Symfony\Component\Mailer\MailerInterface;
use Symfony\Component\Mime\Email;
use Symfony\Component\PasswordHasher\Hasher\UserPasswordHasherInterface;
use Symfony\Component\Routing\Attribute\Route;
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use function PHPUnit\Framework\equalTo;
class PasswordResetController extends AbstractController
{
#[Route('/password/reset/request', name: 'app_password_reset_request', methods: ['POST'])]
public function requestPasswordReset(
Request $request,
EntityManagerInterface $entityManager,
MailerInterface $mailer,
UrlGeneratorInterface $urlGenerator
): Response {
try{
$email = $request->request->get('email');
// Vérifier si l'email est valide
if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
$this->addFlash('error', 'Adresse e-mail invalide.');
return $this->redirectToRoute('app_login');
}
// Générer un token unique
$token = bin2hex(random_bytes(32));
// Enregistrer le token dans la base de données
$passwordResetToken = new PasswordResetToken();
$passwordResetToken->setToken($token)
->setEmail($email)
->setCreatedAt(new \DateTime());
$entityManager->persist($passwordResetToken);
$entityManager->flush();
// Générer un lien de réinitialisation
$resetLink = $urlGenerator->generate(
'app_password_reset',
['token' => $token],
UrlGeneratorInterface::ABSOLUTE_URL
);
// Envoyer l'email avec le lien
$email = (new Email())
->from('contact@sortir.com')
->to($email)
->subject('Sortir.com | Réinitialisation de mot de passe')
->html("<p>Bonjour,</p><p>Vous avez demandé une réinitialisation de mot de passe. Cliquez sur le lien ci-dessous pour réinitialiser votre mot de passe :</p>
<p><a href='$resetLink' target='_blank'>Réinitialiser mon mot de passe</a></p>
<p>Ce lien est valable 24 heures.</p>");
$mailer->send($email);
$this->addFlash('success', 'Un email de réinitialisation a été envoyé.');
return $this->redirectToRoute('app_login');
}catch (TransportExceptionInterface|RandomException $e){
$this->addFlash('error', 'Erreur : ' . $e->getMessage());
return $this->redirectToRoute('app_login');
}
}
#[Route('/password/reset/{token}', name: 'app_password_reset', methods: ['GET', 'POST'])]
public function resetPassword(
string $token,
Request $request,
EntityManagerInterface $entityManager,
): Response {
// Vérifier si le token existe
$repository = $entityManager->getRepository(PasswordResetToken::class);
$passwordResetToken = $repository->findOneBy(['token' => $token]);
if (!$passwordResetToken || $passwordResetToken->isExpired()) {
$this->addFlash('error', 'Ce lien de réinitialisation est invalide ou expiré.');
return $this->redirectToRoute('app_login');
}
// Si la requête est POST, traiter le nouveau mot de passe
if ($request->isMethod('POST')) {
$newPassword = $request->request->get('password');
$newPasswordConfirm = $request->request->get('passwordConfirm');
if ($newPassword.equalTo($newPasswordConfirm)) {
$this->addFlash('error', 'Les mots de passe ne correspondent pas.');
return $this->redirectToRoute('app_password_reset', ['token' => $token]);
}
if (strlen($newPassword) < 6) {
$this->addFlash('error', 'Le mot de passe doit contenir au moins 6 caractères.');
return $this->redirectToRoute('app_password_reset', ['token' => $token]);
}
// Récupérer l'utilisateur et mettre à jour le mot de passe
$user = $entityManager->getRepository(Participant::class)->findOneBy(['email' => $passwordResetToken->getEmail()]);
$user->setPassword(password_hash($newPassword, PASSWORD_BCRYPT));
$entityManager->remove($passwordResetToken); // Supprimer le token
$entityManager->flush();
$this->addFlash('success', 'Votre mot de passe a été mis à jour.');
return $this->redirectToRoute('app_login');
}
return $this->render('password_reset/index.html.twig', ['token' => $token]);
}
}

4
src/DataFixtures/UserFixtures.php
View File

@@ -32,11 +32,11 @@ class UserFixtures extends Fixture
$johan->setNom('Leroy');
$johan->setPseudo('Jojo');
$johan->setTelephone('0785421565');
$johan->setEmail('johan@gmail.com');
$johan->setEmail('leroyjohan3@gmail.com');
$johan->setRoles(['ROLE_USER', 'ROLE_ADMIN']);
$johan->setAdministrateur(true);
$johan->setActif(false);
$johan->setPassword($this->userPasswordHasher->hashPassword($johan, 'test-44'));
$johan->setPassword($this->userPasswordHasher->hashPassword($johan, 'Vn21pd%6a%Hw5j'));
$manager->persist($johan);
$marvin = new Participant();

29
templates/password_reset/index.html.twig Normal file
View File

@@ -0,0 +1,29 @@
{% extends 'main/base.html.twig' %}
{% block head %}
<head>
<meta charset="UTF-8">
{% block stylesheets %}
{{ encore_entry_link_tags('app') }}
{% endblock %}
</head>
{% endblock %}
{%block content %}
<div class="flex flex-col justify-center items-center py-48">
<div class="bg-white shadow-lg rounded-lg p-8 max-w-sm text-center">
<h2 class="text-2xl font-bold text-center pb-6">Modifier votre mot de passe !</h2>
<form action="{{ path('app_password_reset', {'token': token}) }}" method="post">
<label class="text-gray-700 font-bold" for="password">Nouveau mot de passe</label>
<input
class="w-full mb-4 px-4 py-2 border-2 border-gray-300 rounded-lg focus:outline-none focus:border-blue-500"
placeholder="Mot de passe" type="text" name="password" id="password" autocomplete="email" required autofocus>
<label class="text-gray-700 font-bold" for="passwordConfirm">Confirmer votre nouveau mot de passe</label>
<input class="w-full mb-4 px-4 py-2 border-2 border-gray-300 rounded-lg focus:outline-none focus:border-blue-500"
placeholder="Confirmer votre mot de passe" type="password" name="passwordConfirm" id="passwordConfirm" required>
<div class="flex flex-row justify-between">
<button class=" text-white font-bold py-2 px-4 border-b-4 btnRegister rounded" type="submit">Changer mon mot de passe</button>
</div>
</form>
</div>
</div>
{% endblock %}