diff --git a/src/Controller/AuthController.php b/src/Controller/AuthController.php
index 999a89b..1628d9c 100644
--- a/src/Controller/AuthController.php
+++ b/src/Controller/AuthController.php
@@ -26,25 +26,28 @@ class AuthController {
return ViewHttpResponse::twig("display_register.html.twig", []);
}
+ private function displayRegisterBadFields(array $fails): HttpResponse{
+ $bad_fields = [];
+ foreach ($fails as $err) {
+ if ($err instanceof FieldValidationFail) {
+ $bad_fields[] = $err->getFieldName();
+ }
+ }
+ return ViewHttpResponse::twig("display_register.html.twig", ['bad_fields' => $bad_fields]);
+ }
public function confirmRegister(array $request): HttpResponse {
$fails = [];
$request = HttpRequest::from($request, $fails, [
"username" => [Validators::name(), Validators::lenBetween(0, 32)],
- "password" => [Validators::lenBetween(0, 256)],
- "confirmpassword" => [Validators::lenBetween(0, 256)],
- "email" => [Validators::regex("/@/")]
+ "password" => [Validators::lenBetween(6, 256)],
+ "confirmpassword" => [Validators::lenBetween(6, 256)],
+ "email" => [Validators::regex("/^[\w-\.]+@([\w-]+\.)+[\w-]{2,4}$/g"),Validators::lenBetween(5, 256)]
]);
if (!empty($fails)) {
- $bad_fields = [];
- foreach ($fails as $err) {
- if ($err instanceof FieldValidationFail) {
- $bad_fields[] = $err->getFieldName();
- }
- }
- return ViewHttpResponse::twig("display_register.html.twig", ['bad_fields' => $bad_fields]);
+ return $this->displayRegisterBadFields($fails);
}
$fails = $this->model->validationRegister($request['username'], $request["password"], $request['confirmpassword'], $request['email']);
@@ -53,13 +56,7 @@ class AuthController {
return ViewHttpResponse::twig("display_auth_confirm.html.twig", ['username' => $results['username'], 'email' => $results['email']]);
}
- $bad_fields = [];
- foreach ($fails as $err) {
- if ($err instanceof FieldValidationFail) {
- $bad_fields[] = $err->getFieldName();
- }
- }
- return ViewHttpResponse::twig("display_register.html.twig", ['bad_fields' => $bad_fields]);
+ return $this->displayRegisterBadFields($fails);
}
public function displayLogin():HttpResponse{
@@ -75,17 +72,12 @@ class AuthController {
$fails = $this->model->validationLogin($request['email'],$request['password']);
- $bad_fields = [];
- foreach ($fails as $err){
- if ($err instanceof FieldValidationFail){
- $bad_fields [] = $err->getFieldName();
- }
- }
+
if (empty($fails)){
$results = $this->model->getUserFields($request['email']);
return ViewHttpResponse::twig("display_auth_confirm.html.twig",['username' => $results['username'], 'email' => $results['email']]);
}
- return ViewHttpResponse::twig("display_login.html.twig",['bad_fields' => $bad_fields]);
+ return $this->displayRegisterBadFields($fails);
}
}
\ No newline at end of file
diff --git a/src/Views/display_auth_confirm.html.twig b/src/Views/display_auth_confirm.html.twig
index 115676b..89823f4 100644
--- a/src/Views/display_auth_confirm.html.twig
+++ b/src/Views/display_auth_confirm.html.twig
@@ -1,17 +1,48 @@
+
- Compte
-
-
+
+ Profil Utilisateur
+
+
+
+
+
Votre profil
+
Pseudo : {{ username }}
+
Email : {{ email }}
+