diff --git a/public/index.php b/public/index.php
index 6eca6c3..35ac549 100644
--- a/public/index.php
+++ b/public/index.php
@@ -39,7 +39,7 @@ $router->map("POST", "/submit-twig", fn() => $sampleFormController->submitFormTw
$router->map("GET", "/register", fn() => $authController->displayRegister());
$router->map("POST", "/register", fn() => $authController->confirmRegister($_POST));
$router->map("GET", "/login", fn() => $authController->displayLogin());
-$router->map("POST", "/login", fn() => $authController->displayLoginPassed($_POST));
+$router->map("POST", "/login", fn() => $authController->confirmLogin($_POST));
$router->map("GET", "/tactic/new", fn() => $editorController->makeNew());
$router->map("GET", "/tactic/[i:id]/edit", fn(int $id) => $editorController->openEditorFor($id));
diff --git a/src/Controller/AuthController.php b/src/Controller/AuthController.php
index acc3aab..b4ef8cb 100644
--- a/src/Controller/AuthController.php
+++ b/src/Controller/AuthController.php
@@ -35,8 +35,9 @@ class AuthController {
}
return ViewHttpResponse::twig($viewName, ['bad_fields' => $bad_fields]);
}
- public function confirmRegister(array $request): HttpResponse {
+
+ public function confirmRegister(array $request): HttpResponse {
$fails = [];
$request = HttpRequest::from($request, $fails, [
"username" => [Validators::name(), Validators::lenBetween(2, 32)],
@@ -44,35 +45,34 @@ class AuthController {
"confirmpassword" => [Validators::lenBetween(6, 256)],
"email" => [Validators::regex("/^\\S+@\\S+\\.\\S+$/"),Validators::lenBetween(5, 256)]
]);
-
-
if (!empty($fails)) {
return $this->displayBadFields("display_register.html.twig",$fails);
}
-
$fails = $this->model->register($request['username'], $request["password"], $request['confirmpassword'], $request['email']);
if (empty($fails)) {
$results = $this->model->getUserFields($request['email']);
return ViewHttpResponse::twig("display_auth_confirm.html.twig", ['username' => $results['username'], 'email' => $results['email']]);
}
-
return $this->displayBadFields("display_register.html.twig",$fails);
}
+
public function displayLogin():HttpResponse{
return ViewHttpResponse::twig("display_login.html.twig", []);
}
- public function displayLoginPassed(array $request):HttpResponse{
+
+ public function confirmLogin(array $request):HttpResponse{
$fails = [];
$request = HttpRequest::from($request, $fails, [
"password" => [Validators::lenBetween(6, 256)],
"email" => [Validators::regex("/^\\S+@\\S+\\.\\S+$/"),Validators::lenBetween(5, 256)]
]);
-
+ if (!empty($fails)) {
+ return $this->displayBadFields("display_login.html.twig",$fails);
+ }
$fails = $this->model->login($request['email'],$request['password']);
-
if (empty($fails)){
$results = $this->model->getUserFields($request['email']);
return ViewHttpResponse::twig("display_auth_confirm.html.twig",['username' => $results['username'], 'email' => $results['email']]);
diff --git a/src/Views/display_error_validation_register.html.twig b/src/Views/display_error_validation_register.html.twig
deleted file mode 100644
index 95befc0..0000000
--- a/src/Views/display_error_validation_register.html.twig
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
- Compte
-
-
-
-ERROR REGISTER
-
-
-
-
-
\ No newline at end of file