Merge branch 'Johan'
This commit is contained in:
@@ -19,22 +19,29 @@ use Symfony\Component\Mailer\MailerInterface;
|
||||
use Symfony\Component\Mime\Email;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
|
||||
|
||||
class AdminController extends AbstractController
|
||||
{
|
||||
#[Route('/admin', name: 'app_admin')]
|
||||
public function index(): Response
|
||||
public function index(TokenStorageInterface $tokenStorage): Response
|
||||
{
|
||||
$token = $tokenStorage->getToken();
|
||||
$userConnect = $token?->getUser();
|
||||
return $this->render('admin/index.html.twig', [
|
||||
'profile' => $userConnect,
|
||||
'controller_name' => 'AdminController',
|
||||
]);
|
||||
}
|
||||
|
||||
//Gestion des utilisateurs
|
||||
#[Route('/admin/user', name: 'app_adminUser')]
|
||||
public function adminUser(ParticipantRepository $participantRepository): Response
|
||||
public function adminUser(ParticipantRepository $participantRepository, TokenStorageInterface $tokenStorage): Response
|
||||
{
|
||||
$token = $tokenStorage->getToken();
|
||||
$userConnect = $token?->getUser();
|
||||
return $this->render('admin/user.html.twig', [
|
||||
'profile' => $userConnect,
|
||||
'participants' => $participantRepository->findAll(),
|
||||
'controller_name' => 'AdminController',
|
||||
]);
|
||||
@@ -166,7 +173,7 @@ class AdminController extends AbstractController
|
||||
}
|
||||
}
|
||||
#[Route('/admin/user/import', name: 'participant_import', methods: ['POST'])]
|
||||
public function import(Request $request, EntityManagerInterface $em): RedirectResponse
|
||||
public function import(Request $request, EntityManagerInterface $em, MailerInterface $mailer, UrlGeneratorInterface $urlGenerator): RedirectResponse
|
||||
{
|
||||
$file = $request->files->get('csv_file');
|
||||
if ($file) {
|
||||
@@ -184,6 +191,39 @@ class AdminController extends AbstractController
|
||||
$participant->setRoles(explode('|', $row[7]));
|
||||
$participant->setPassword(password_hash("aChanger44!", PASSWORD_BCRYPT));
|
||||
$em->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());
|
||||
|
||||
$em->persist($passwordResetToken);
|
||||
|
||||
// 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($participant->getEmail())
|
||||
->subject('Sortir.com | Bienvenue sur notre site !')
|
||||
->html("
|
||||
<h1>Bonjour $row[2],</h1>
|
||||
<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>
|
||||
");
|
||||
|
||||
$mailer->send($email);
|
||||
|
||||
}
|
||||
$em->flush();
|
||||
}
|
||||
@@ -216,9 +256,12 @@ class AdminController extends AbstractController
|
||||
|
||||
//Gestion des villes
|
||||
#[Route('/admin/city', name: 'app_adminCity')]
|
||||
public function adminCity(VilleRepository $villeRepository): Response
|
||||
public function adminCity(VilleRepository $villeRepository, TokenStorageInterface $tokenStorage): Response
|
||||
{
|
||||
$token = $tokenStorage->getToken();
|
||||
$userConnect = $token?->getUser();
|
||||
return $this->render('admin/city.html.twig', [
|
||||
'profile' => $userConnect,
|
||||
'citys' => $villeRepository->findAll(),
|
||||
'controller_name' => 'AdminController',
|
||||
]);
|
||||
@@ -275,9 +318,12 @@ class AdminController extends AbstractController
|
||||
|
||||
//Gestion des sites
|
||||
#[Route('/admin/site', name: 'app_adminSite')]
|
||||
public function adminSite(SiteRepository $siteRepository): Response
|
||||
public function adminSite(SiteRepository $siteRepository, TokenStorageInterface $tokenStorage): Response
|
||||
{
|
||||
$token = $tokenStorage->getToken();
|
||||
$userConnect = $token?->getUser();
|
||||
return $this->render('admin/site.html.twig', [
|
||||
'profile' => $userConnect,
|
||||
'sites' => $siteRepository->findAll(),
|
||||
'controller_name' => 'AdminController',
|
||||
]);
|
||||
|
||||
@@ -5,12 +5,17 @@ namespace App\Controller;
|
||||
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Attribute\Route;
|
||||
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
|
||||
|
||||
class MainController extends AbstractController
|
||||
{
|
||||
#[Route('/', name: 'home')]
|
||||
public function index(): Response
|
||||
public function index(TokenStorageInterface $tokenStorage): Response
|
||||
{
|
||||
return $this->render('main/index.html.twig');
|
||||
$token = $tokenStorage->getToken();
|
||||
$userConnect = $token?->getUser();
|
||||
return $this->render('main/index.html.twig', [
|
||||
'profile' => $userConnect,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -93,9 +93,11 @@ class PasswordResetController extends AbstractController
|
||||
$newPassword = $request->request->get('password');
|
||||
$newPasswordConfirm = $request->request->get('passwordConfirm');
|
||||
|
||||
if ($newPassword.equalTo($newPasswordConfirm)) {
|
||||
// Vérifier si les mots de passe sont identiques
|
||||
if ($newPassword !== $newPasswordConfirm) {
|
||||
// Les mots de passe ne correspondent pas
|
||||
$this->addFlash('error', 'Les mots de passe ne correspondent pas.');
|
||||
return $this->redirectToRoute('app_password_reset', ['token' => $token]);
|
||||
return $this->redirectToRoute('app_password_reset'); // Vous pouvez rediriger vers la page de réinitialisation
|
||||
}
|
||||
|
||||
if (strlen($newPassword) < 6) {
|
||||
|
||||
Reference in New Issue
Block a user