apply lasts suggestions

1 year ago · 7685ff8454
parent ff77f2fb89
commit 7685ff8454
3 changed files with 9 additions and 22 deletions
--- 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));

--- 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']]);
--- a/src/Views/display_error_validation_register.html.twig
+++ b/src/Views/display_error_validation_register.html.twig
@ -1,13 +0,0 @@
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Compte</title>
-</head>
-<body>
-
-<center><h2>ERROR REGISTER</h2></center>
-
-
-
-</body>
-</html>