From 60229815b49968bf90f4f8907e97f09604e5ef52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Franti=C5=A1ek=20=C5=A0pa=C4=8Dek?= <spacefr1@cvut.cz>
Date: Wed, 15 May 2024 02:59:13 +0200
Subject: [PATCH] Auth fix #4

---
 src/Controller/UserController.php |  3 ++-
 templates/login.html.twig         | 26 +++++++++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index f46c298..1acb19e 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -4,6 +4,7 @@ namespace App\Controller;
 
 use App\Document\User;
 use App\Form\Type\UserType;
+use App\Form\Type\LoginType;
 use Doctrine\ODM\MongoDB\DocumentManager;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Security\Http\Authentication\AuthenticationUtils;
@@ -18,7 +19,7 @@ class UserController extends AbstractController
 
     #[Route('/create', name: 'create', defaults: ['id' => null])]
     #[Route('/{id}/edit', name: 'edit')]
-    public function editAction(DocumentManager $dm, Request $request, int $id)
+    public function editAction(DocumentManager $dm, Request $request, ?int $id)
     {
         $user = $dm->getRepository(User::class)->find($id);
         if ($user == null)
diff --git a/templates/login.html.twig b/templates/login.html.twig
index 3f963af..bc1b4cf 100644
--- a/templates/login.html.twig
+++ b/templates/login.html.twig
@@ -8,11 +8,31 @@
 	{{ parent() }}
 	<main>
 		<div class="loginDiv">
-			{{ form_start(form, {'action': path('users_login'), 'method': 'POST'}) }}
+			<form action="{{ path('users_login') }}" method="post">
+				<label for="username">Uživatelské jméno</label>
+				<input type="text" name="username" id="username" value="{{ last_username }}" required/>
+				<label for="password">Heslo</label>
+				<input type="password" name="password" id="password" placeholder="********" required/>
+
+				<input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}">
+
+				<label>
+					<input type="checkbox" name="_remember_me" checked>
+					Zůstat přihlášen
+				</label>
+
+				<input type="submit" value="Přihlásit se"/>
+			</form>
+
+			{% if error %}
+				<p class="login-form__error">{{ error.messageKey|trans(error.messageData, 'security') }}</p>
+			{% endif %}
+
+			<!--{{ form_start(form, {'action': path('users_login'), 'method': 'POST'}) }}
 			{{ form_widget(form) }}
 
 			<input type="submit"/>
-			{{ form_end(form) }}
+			{{ form_end(form) }}-->
 		</div>
 	</main>
-{% endblock %}
\ No newline at end of file
+{% endblock %}