+
+ {% endfor %}
+ {% for message in app.flashes('error') %}
+ {{ message }}
+
+
+ {% endfor %}
+ {% block body %}{% endblock %}
+ {{ message }}
+
-
© {{ "now"|date("Y") }} E-COSPLAY.
+© {{ "now"|date("Y") }} E-TICKET.
+Solution proposee par l'association e-cosplay.fr
RNA N°W022006988
diff --git a/templates/email/admin_reset_password.html.twig b/templates/email/admin_reset_password.html.twig
new file mode 100644
index 0000000..0c3818b
--- /dev/null
+++ b/templates/email/admin_reset_password.html.twig
@@ -0,0 +1,13 @@
+{% extends 'email/base.html.twig' %}
+
+{% block title %}Reinitialisation de votre mot de passe{% endblock %}
+
+{% block content %}
+
diff --git a/templates/email/organizer_approved.html.twig b/templates/email/organizer_approved.html.twig
new file mode 100644
index 0000000..21da7ef
--- /dev/null
+++ b/templates/email/organizer_approved.html.twig
@@ -0,0 +1,12 @@
+{% extends 'email/base.html.twig' %}
+
+{% block title %}Votre compte organisateur a ete approuve{% endblock %}
+
+{% block content %}
+ $roles
+ */
+ private function createUser(array $roles = []): User
+ {
+ $em = static::getContainer()->get(EntityManagerInterface::class);
+
+ $user = new User();
+ $user->setEmail('test-admin-'.uniqid().'@example.com');
+ $user->setFirstName('Admin');
+ $user->setLastName('User');
+ $user->setPassword('$2y$13$hashed');
+ $user->setRoles($roles);
+
+ $em->persist($user);
+ $em->flush();
+
+ return $user;
+ }
+
+ private function createOrganizer(EntityManagerInterface $em): User
+ {
+ $orga = new User();
+ $orga->setEmail('test-orga-'.uniqid().'@example.com');
+ $orga->setFirstName('Orga');
+ $orga->setLastName('Test');
+ $orga->setPassword('$2y$13$hashed');
+ $orga->setRoles(['ROLE_ORGANIZER']);
+ $orga->setIsVerified(true);
+ $orga->setCompanyName('Mon Asso');
+ $orga->setSiret('12345678901234');
+
+ $em->persist($orga);
+ $em->flush();
+
+ return $orga;
+ }
+}
diff --git a/tests/MessageHandler/MeilisearchMessageHandlerTest.php b/tests/MessageHandler/MeilisearchMessageHandlerTest.php
index 59eb00e..1085f74 100644
--- a/tests/MessageHandler/MeilisearchMessageHandlerTest.php
+++ b/tests/MessageHandler/MeilisearchMessageHandlerTest.php
@@ -21,8 +21,8 @@ class MeilisearchMessageHandlerTest extends TestCase
public function testHandleCreateIndex(): void
{
$this->meilisearch->expects(self::once())
- ->method('createIndex')
- ->with('events', 'uid');
+ ->method('request')
+ ->with('POST', '/indexes', ['uid' => 'events', 'primaryKey' => 'uid']);
($this->handler)(new MeilisearchMessage('createIndex', 'events', ['primaryKey' => 'uid']));
}
@@ -30,8 +30,8 @@ class MeilisearchMessageHandlerTest extends TestCase
public function testHandleDeleteIndex(): void
{
$this->meilisearch->expects(self::once())
- ->method('deleteIndex')
- ->with('events');
+ ->method('request')
+ ->with('DELETE', '/indexes/events');
($this->handler)(new MeilisearchMessage('deleteIndex', 'events'));
}
@@ -40,8 +40,8 @@ class MeilisearchMessageHandlerTest extends TestCase
{
$docs = [['id' => 1]];
$this->meilisearch->expects(self::once())
- ->method('addDocuments')
- ->with('events', $docs);
+ ->method('request')
+ ->with('POST', '/indexes/events/documents', $docs);
($this->handler)(new MeilisearchMessage('addDocuments', 'events', ['documents' => $docs]));
}
@@ -50,8 +50,8 @@ class MeilisearchMessageHandlerTest extends TestCase
{
$docs = [['id' => 1, 'title' => 'Updated']];
$this->meilisearch->expects(self::once())
- ->method('updateDocuments')
- ->with('events', $docs);
+ ->method('request')
+ ->with('PUT', '/indexes/events/documents', $docs);
($this->handler)(new MeilisearchMessage('updateDocuments', 'events', ['documents' => $docs]));
}
@@ -59,8 +59,8 @@ class MeilisearchMessageHandlerTest extends TestCase
public function testHandleDeleteDocument(): void
{
$this->meilisearch->expects(self::once())
- ->method('deleteDocument')
- ->with('events', 42);
+ ->method('request')
+ ->with('DELETE', '/indexes/events/documents/42');
($this->handler)(new MeilisearchMessage('deleteDocument', 'events', ['documentId' => 42]));
}
@@ -68,8 +68,8 @@ class MeilisearchMessageHandlerTest extends TestCase
public function testHandleDeleteDocuments(): void
{
$this->meilisearch->expects(self::once())
- ->method('deleteDocuments')
- ->with('events', [1, 2, 3]);
+ ->method('request')
+ ->with('POST', '/indexes/events/documents/delete-batch', [1, 2, 3]);
($this->handler)(new MeilisearchMessage('deleteDocuments', 'events', ['ids' => [1, 2, 3]]));
}
@@ -78,8 +78,8 @@ class MeilisearchMessageHandlerTest extends TestCase
{
$settings = ['searchableAttributes' => ['title']];
$this->meilisearch->expects(self::once())
- ->method('updateSettings')
- ->with('events', $settings);
+ ->method('request')
+ ->with('PATCH', '/indexes/events/settings', $settings);
($this->handler)(new MeilisearchMessage('updateSettings', 'events', ['settings' => $settings]));
}
diff --git a/vite.config.js b/vite.config.js
index 284c25c..15fa0f5 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -42,6 +42,7 @@ export default defineConfig({
rollupOptions: {
input: {
app: resolve(__dirname, 'assets/app.js'),
+ admin: resolve(__dirname, 'assets/admin.js'),
}
},
},
Bonjour {{ firstName }} !
+Un administrateur E-Ticket a initie une reinitialisation de votre mot de passe pour le compte associe a l'adresse {{ email }}.
+Pour definir un nouveau mot de passe, cliquez sur le bouton ci-dessous :
++ Reinitialiser mon mot de passe +
+Si vous n'avez pas fait cette demande, vous pouvez ignorer cet email. Votre mot de passe actuel restera inchange.
+{% endblock %} diff --git a/templates/email/base.html.twig b/templates/email/base.html.twig index 1960d51..bd9ccff 100644 --- a/templates/email/base.html.twig +++ b/templates/email/base.html.twig @@ -10,75 +10,74 @@ margin: 0; padding: 0; font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif; - background-color: #f4f4f5; - color: #18181b; + background-color: #fbfbfb; + color: #111827; } .wrapper { width: 100%; padding: 40px 0; - background-color: #f4f4f5; + background-color: #fbfbfb; } .container { max-width: 600px; margin: 0 auto; background-color: #ffffff; - border-radius: 12px; - overflow: hidden; - box-shadow: 0 1px 3px rgba(0,0,0,0.1); + border: 4px solid #111827; + box-shadow: 8px 8px 0 rgba(0,0,0,1); } .header { - background-color: #7c3aed; - color: #ffffff; - padding: 32px; + background-color: #111827; + padding: 24px 32px; text-align: center; } - .header h1 { - margin: 0; - font-size: 24px; - font-weight: 700; + .header img { + height: 40px; + width: auto; } .content { padding: 32px; } .content h2 { margin: 0 0 16px; - font-size: 20px; - color: #18181b; + font-size: 22px; + font-weight: 900; + text-transform: uppercase; + letter-spacing: -0.025em; + color: #111827; } .content p { margin: 0 0 16px; - font-size: 16px; + font-size: 15px; line-height: 1.6; - color: #3f3f46; + color: #374151; } .btn { display: inline-block; padding: 14px 28px; - background-color: #7c3aed; - color: #ffffff; + background-color: #fabf04; + color: #111827; text-decoration: none; - border-radius: 8px; - font-weight: 600; - font-size: 16px; - } - .qr-code { - text-align: center; - padding: 24px 0; - } - .qr-code img { - width: 200px; - height: 200px; + font-weight: 900; + font-size: 14px; + text-transform: uppercase; + letter-spacing: 0.05em; + border: 3px solid #111827; + box-shadow: 4px 4px 0 rgba(0,0,0,1); } .footer { padding: 24px 32px; - text-align: center; - font-size: 13px; - color: #a1a1aa; - border-top: 1px solid #e4e4e7; + background-color: #fabf04; + border-top: 4px solid #111827; + } + .footer p { + margin: 0 0 4px; + font-size: 12px; + font-weight: 700; + color: #111827; } .footer a { - color: #7c3aed; - text-decoration: none; + color: #111827; + text-decoration: underline; } @@ -86,15 +85,17 @@
- 
🎫 E-Ticket
+
{% block content %}{% endblock %}
Felicitations {{ firstName }} !
+Votre demande de compte organisateur a ete approuvee par l'equipe E-Ticket.
+Vous pouvez desormais vous connecter et commencer a creer vos evenements.
++ Se connecter +
+{% endblock %} diff --git a/templates/email/organizer_rejected.html.twig b/templates/email/organizer_rejected.html.twig new file mode 100644 index 0000000..aef3188 --- /dev/null +++ b/templates/email/organizer_rejected.html.twig @@ -0,0 +1,12 @@ +{% extends 'email/base.html.twig' %} + +{% block title %}Votre demande de compte organisateur a ete refusee{% endblock %} + +{% block content %} +Bonjour {{ firstName }},
+Nous avons examine votre demande de compte organisateur et malheureusement, celle-ci a ete refusee.
+Si vous pensez qu'il s'agit d'une erreur ou si vous souhaitez obtenir plus d'informations, n'hesitez pas a nous contacter.
++ Nous contacter +
+{% endblock %} diff --git a/tests/Controller/AdminControllerTest.php b/tests/Controller/AdminControllerTest.php new file mode 100644 index 0000000..f7ee251 --- /dev/null +++ b/tests/Controller/AdminControllerTest.php @@ -0,0 +1,350 @@ +request('GET', '/admin'); + + self::assertResponseRedirects(); + } + + public function testDashboardDeniedForNonRoot(): void + { + $client = static::createClient(); + $user = $this->createUser(); + + $client->loginUser($user); + $client->request('GET', '/admin'); + + self::assertResponseStatusCodeSame(403); + } + + public function testDashboardReturnsSuccessForRoot(): void + { + $client = static::createClient(); + $user = $this->createUser(['ROLE_ROOT']); + + $client->loginUser($user); + $client->request('GET', '/admin'); + + self::assertResponseIsSuccessful(); + } + + public function testUsersPageReturnsSuccessForRoot(): void + { + $client = static::createClient(); + $user = $this->createUser(['ROLE_ROOT']); + + $client->loginUser($user); + $client->request('GET', '/admin/utilisateurs'); + + self::assertResponseIsSuccessful(); + } + + public function testUsersPageDeniedForNonRoot(): void + { + $client = static::createClient(); + $user = $this->createUser(); + + $client->loginUser($user); + $client->request('GET', '/admin/utilisateurs'); + + self::assertResponseStatusCodeSame(403); + } + + public function testBuyersPageReturnsSuccessForRoot(): void + { + $client = static::createClient(); + $user = $this->createUser(['ROLE_ROOT']); + + $client->loginUser($user); + $client->request('GET', '/admin/acheteurs'); + + self::assertResponseIsSuccessful(); + } + + public function testBuyersSearchWithQuery(): void + { + $client = static::createClient(); + $admin = $this->createUser(['ROLE_ROOT']); + + $meilisearch = $this->createMock(MeilisearchService::class); + $meilisearch->expects(self::once())->method('search')->willReturn([ + 'hits' => [], + 'estimatedTotalHits' => 0, + ]); + static::getContainer()->set(MeilisearchService::class, $meilisearch); + + $client->loginUser($admin); + $client->request('GET', '/admin/acheteurs?q=test'); + + self::assertResponseIsSuccessful(); + } + + public function testSyncMeilisearch(): void + { + $client = static::createClient(); + $admin = $this->createUser(['ROLE_ROOT']); + + $meilisearch = $this->createMock(MeilisearchService::class); + $meilisearch->expects(self::once())->method('createIndexIfNotExists'); + static::getContainer()->set(MeilisearchService::class, $meilisearch); + + $client->loginUser($admin); + $client->request('POST', '/admin/sync-meilisearch'); + + self::assertResponseRedirects('/admin'); + } + + public function testCreateBuyerWithValidData(): void + { + $client = static::createClient(); + $admin = $this->createUser(['ROLE_ROOT']); + + $mailer = $this->createMock(MailerService::class); + $mailer->expects(self::once())->method('sendEmail'); + static::getContainer()->set(MailerService::class, $mailer); + + $client->loginUser($admin); + $client->request('POST', '/admin/acheteurs/creer', [ + 'first_name' => 'Nouveau', + 'last_name' => 'Acheteur', + 'email' => 'new-buyer-'.uniqid().'@example.com', + ]); + + self::assertResponseRedirects('/admin/acheteurs'); + } + + public function testCreateBuyerWithDuplicateEmail(): void + { + $client = static::createClient(); + $admin = $this->createUser(['ROLE_ROOT']); + + $client->loginUser($admin); + $client->request('POST', '/admin/acheteurs/creer', [ + 'first_name' => 'Dup', + 'last_name' => 'Test', + 'email' => $admin->getEmail(), + ]); + + self::assertResponseRedirects('/admin/acheteurs'); + } + + public function testResendVerificationEmail(): void + { + $client = static::createClient(); + $em = static::getContainer()->get(EntityManagerInterface::class); + + $admin = $this->createUser(['ROLE_ROOT']); + + $buyer = new User(); + $buyer->setEmail('test-buyer-'.uniqid().'@example.com'); + $buyer->setFirstName('Buyer'); + $buyer->setLastName('Test'); + $buyer->setPassword('$2y$13$hashed'); + $em->persist($buyer); + $em->flush(); + + $mailer = $this->createMock(MailerService::class); + $mailer->expects(self::once())->method('sendEmail'); + static::getContainer()->set(MailerService::class, $mailer); + + $client->loginUser($admin); + $client->request('POST', '/admin/acheteur/'.$buyer->getId().'/renvoyer-verification'); + + self::assertResponseRedirects('/admin/acheteurs'); + + $em->refresh($buyer); + self::assertNotNull($buyer->getEmailVerificationToken()); + } + + public function testResetPasswordSendsEmail(): void + { + $client = static::createClient(); + $em = static::getContainer()->get(EntityManagerInterface::class); + + $admin = $this->createUser(['ROLE_ROOT']); + + $buyer = new User(); + $buyer->setEmail('test-reset-admin-'.uniqid().'@example.com'); + $buyer->setFirstName('Reset'); + $buyer->setLastName('Test'); + $buyer->setPassword('$2y$13$hashed'); + $buyer->setIsVerified(true); + $em->persist($buyer); + $em->flush(); + + $mailer = $this->createMock(MailerService::class); + $mailer->expects(self::once())->method('sendEmail'); + static::getContainer()->set(MailerService::class, $mailer); + + $client->loginUser($admin); + $client->request('POST', '/admin/acheteur/'.$buyer->getId().'/reset-password'); + + self::assertResponseRedirects('/admin/acheteurs'); + } + + public function testDeleteBuyer(): void + { + $client = static::createClient(); + $em = static::getContainer()->get(EntityManagerInterface::class); + + $admin = $this->createUser(['ROLE_ROOT']); + + $buyer = new User(); + $buyer->setEmail('test-delete-'.uniqid().'@example.com'); + $buyer->setFirstName('Delete'); + $buyer->setLastName('Test'); + $buyer->setPassword('$2y$13$hashed'); + $em->persist($buyer); + $em->flush(); + $buyerId = $buyer->getId(); + + $client->loginUser($admin); + $client->request('POST', '/admin/acheteur/'.$buyerId.'/supprimer'); + + self::assertResponseRedirects('/admin/acheteurs'); + + $deleted = $em->getRepository(User::class)->find($buyerId); + self::assertNull($deleted); + } + + public function testForceVerification(): void + { + $client = static::createClient(); + $em = static::getContainer()->get(EntityManagerInterface::class); + + $admin = $this->createUser(['ROLE_ROOT']); + + $buyer = new User(); + $buyer->setEmail('test-force-'.uniqid().'@example.com'); + $buyer->setFirstName('Force'); + $buyer->setLastName('Test'); + $buyer->setPassword('$2y$13$hashed'); + $em->persist($buyer); + $em->flush(); + + $client->loginUser($admin); + $client->request('POST', '/admin/acheteur/'.$buyer->getId().'/forcer-verification'); + + self::assertResponseRedirects('/admin/acheteurs'); + + $em->refresh($buyer); + self::assertTrue($buyer->isVerified()); + self::assertNotNull($buyer->getEmailVerifiedAt()); + self::assertNull($buyer->getEmailVerificationToken()); + } + + public function testOrganizersPagePendingTab(): void + { + $client = static::createClient(); + $admin = $this->createUser(['ROLE_ROOT']); + + $client->loginUser($admin); + $client->request('GET', '/admin/organisateurs'); + + self::assertResponseIsSuccessful(); + } + + public function testOrganizersPageApprovedTab(): void + { + $client = static::createClient(); + $admin = $this->createUser(['ROLE_ROOT']); + + $client->loginUser($admin); + $client->request('GET', '/admin/organisateurs?tab=approved'); + + self::assertResponseIsSuccessful(); + } + + public function testApproveOrganizer(): void + { + $client = static::createClient(); + $em = static::getContainer()->get(EntityManagerInterface::class); + + $admin = $this->createUser(['ROLE_ROOT']); + $orga = $this->createOrganizer($em); + + $mailer = $this->createMock(MailerService::class); + $mailer->expects(self::once())->method('sendEmail'); + static::getContainer()->set(MailerService::class, $mailer); + + $client->loginUser($admin); + $client->request('POST', '/admin/organisateur/'.$orga->getId().'/approuver'); + + self::assertResponseRedirects('/admin/organisateurs'); + + $em->refresh($orga); + self::assertTrue($orga->isApproved()); + } + + public function testRejectOrganizer(): void + { + $client = static::createClient(); + $em = static::getContainer()->get(EntityManagerInterface::class); + + $admin = $this->createUser(['ROLE_ROOT']); + $orga = $this->createOrganizer($em); + $orgaId = $orga->getId(); + + $mailer = $this->createMock(MailerService::class); + $mailer->expects(self::once())->method('sendEmail'); + static::getContainer()->set(MailerService::class, $mailer); + + $client->loginUser($admin); + $client->request('POST', '/admin/organisateur/'.$orgaId.'/refuser'); + + self::assertResponseRedirects('/admin/organisateurs'); + + $deleted = $em->getRepository(User::class)->find($orgaId); + self::assertNull($deleted); + } + + /** + * @param list