From 959b9cf0d0cff181a8c9177a41235185ea4144a6 Mon Sep 17 00:00:00 2001 From: Leo Tuaillon Date: Mon, 6 Nov 2023 17:53:22 +0100 Subject: [PATCH 1/4] connection --- php/src/config/config.php | 6 +-- php/src/controleur/UtilisateurControleur.php | 43 +++++++++------ php/src/gateway/AlumniGateway.php | 4 +- php/src/{modele => metier}/Alumni.php | 7 ++- php/src/{modele => metier}/Article.php | 2 +- php/src/{modele => metier}/Evenement.php | 2 +- php/src/{modele => metier}/Experience.php | 2 +- php/src/{modele => metier}/Formation.php | 2 +- php/src/{modele => metier}/Offre.php | 2 +- php/src/{modele => metier}/Profil.php | 2 +- php/src/{modele => metier}/Role.php | 2 +- php/src/modele/AdminModele.php | 4 +- php/src/modele/UtilisateurModele.php | 52 ++++++++++++++++--- php/templates/accueil.html | 3 ++ .../{connexion.html => connection.html} | 2 +- 15 files changed, 98 insertions(+), 37 deletions(-) rename php/src/{modele => metier}/Alumni.php (88%) rename php/src/{modele => metier}/Article.php (97%) rename php/src/{modele => metier}/Evenement.php (98%) rename php/src/{modele => metier}/Experience.php (98%) rename php/src/{modele => metier}/Formation.php (98%) rename php/src/{modele => metier}/Offre.php (99%) rename php/src/{modele => metier}/Profil.php (98%) rename php/src/{modele => metier}/Role.php (77%) rename php/templates/{connexion.html => connection.html} (95%) diff --git a/php/src/config/config.php b/php/src/config/config.php index 0a66244..dcb711b 100755 --- a/php/src/config/config.php +++ b/php/src/config/config.php @@ -7,6 +7,6 @@ $rep = __DIR__ . '/php/'; $dConfig['includes']= array('controleur/Validation.php'); //BD -$base = 'mysql:host=localhost;dbname=dbAlica'; -$login = 'root'; -$mdp = ''; +define('DB_HOST', 'mysql:host=localhost;dbname=dbAlica'); +define('DB_USER', 'Dev'); +define('DB_PASS', 'Dev'); \ No newline at end of file diff --git a/php/src/controleur/UtilisateurControleur.php b/php/src/controleur/UtilisateurControleur.php index 7ac47ec..5df7d7d 100755 --- a/php/src/controleur/UtilisateurControleur.php +++ b/php/src/controleur/UtilisateurControleur.php @@ -22,6 +22,7 @@ class UtilisateurControleur break; case "inscription": $this->inscription(); + break; case "consulterProfilLimite": $this->consulterProfilLimite(); @@ -36,7 +37,22 @@ class UtilisateurControleur protected function connection() { global $twig; - echo $twig->render('connexion.html', []); + $dVueErreur = []; // Tableau pour stocker les erreurs, le cas échéant + + if (isset($_POST['email'], $_POST['password'])) { + $email = \App\config\Validation::nettoyerString($_POST['email']); + $motDePasse = \App\config\Validation::nettoyerString($_POST['password']); + $userModel = new \App\modele\UtilisateurModele(); + $utilisateur = $userModel->connection($email, $motDePasse); + if ($utilisateur instanceof \App\metier\Alumni) { + $_SESSION['utilisateur'] = $utilisateur; + header('Location: index.php?action=accueil'); + exit(); + } else { + $dVueErreur[] = "L'adresse email ou le mot de passe est incorrect."; + } + } + echo $twig->render('connection.html', ['dVueErreur' => $dVueErreur]); } protected function inscription() @@ -47,29 +63,26 @@ class UtilisateurControleur if (isset($_POST['email'], $_POST['username'], $_POST['password'])) { $email = \App\config\Validation::nettoyerString($_POST['email']); $motDePasse = \App\config\Validation::nettoyerString($_POST['password']); - - - // Validez les données d'inscription, par exemple, vérifiez si l'email est unique - // Vous pouvez également effectuer d'autres validations nécessaires - + // verification que l'email est valide et unique : + if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { + $dVueErreur[] = "L'adresse email n'est pas valide."; + } else { + $userModel = new \App\modele\UtilisateurModele(); + $utilisateur = $userModel->getUtilisateurByEmail($email); + if ($utilisateur instanceof \App\metier\Alumni) { + $dVueErreur[] = "L'adresse email est déjà utilisée."; + } + } $userModel = new \App\modele\UtilisateurModele(); $nouvelUtilisateur = $userModel->inscription($email, $motDePasse); - // Si l'inscription a réussi, redirigez l'utilisateur vers une page de confirmation - // Vous pouvez également gérer les erreurs ici en cas d'échec de l'inscription - - if ($nouvelUtilisateur instanceof \App\modele\Alumni) { - // L'inscription a réussi, redirigez l'utilisateur vers une page de confirmation - // par exemple : + if ($nouvelUtilisateur instanceof \App\metier\Alumni) { header('Location: index.php?action=inscription_success'); exit(); } else { - // L'inscription a échoué, ajoutez un message d'erreur $dVueErreur[] = "L'inscription a échoué, veuillez réessayer."; } } - - // Affichez le formulaire d'inscription ou les erreurs le cas échéant echo $twig->render('inscription.html', ['dVueErreur' => $dVueErreur]); } diff --git a/php/src/gateway/AlumniGateway.php b/php/src/gateway/AlumniGateway.php index 1a00ff4..9f140bc 100644 --- a/php/src/gateway/AlumniGateway.php +++ b/php/src/gateway/AlumniGateway.php @@ -64,12 +64,12 @@ class AlumniGateway } public function findByEmail(string $email){ - $query='SELECT * FROM Alumni WHERE email=:e'; + $query='SELECT * FROM Alumni WHERE mail=:e'; $this->con->executeQuery($query, array( ':e' => array($email, PDO::PARAM_STR), )); $res=$this->con->getResults(); - return new Alumni($res[0]['mail'],$res[0]['id'],$res[0]['mdp'],$res[0]['role']); + return new \App\metier\Alumni($res[0]['mail'],$res[0]['mdp'],$res[0]['role']); } public function getAll(){ diff --git a/php/src/modele/Alumni.php b/php/src/metier/Alumni.php similarity index 88% rename from php/src/modele/Alumni.php rename to php/src/metier/Alumni.php index 7084fba..d1ac2fe 100644 --- a/php/src/modele/Alumni.php +++ b/php/src/metier/Alumni.php @@ -1,6 +1,6 @@ role; } + + public function getPassword(): string + { + return $this->motDePasse; + } } \ No newline at end of file diff --git a/php/src/modele/Article.php b/php/src/metier/Article.php similarity index 97% rename from php/src/modele/Article.php rename to php/src/metier/Article.php index db20f77..1c4ca95 100644 --- a/php/src/modele/Article.php +++ b/php/src/metier/Article.php @@ -1,5 +1,5 @@ findByEmail($email); + if ($utilisateur instanceof \App\metier\Alumni) { + // L'utilisateur existe, vérifiez le mot de passe + if ($hash==$utilisateur->getPassword()) { + // Le mot de passe est correct, retournez l'utilisateur + return $utilisateur; + } else { + // Le mot de passe est incorrect, renvoyez null + return new \App\metier\Alumni(null, null, null); + } + } else { + // L'utilisateur n'existe pas, renvoyez null + return new \App\metier\Alumni(null, null, null); + } } /** @@ -31,7 +50,7 @@ class UtilisateurModele * @param string $pseudo * @return \Alumni chargé */ - public function inscription(string $email, string $hashpassword): \App\modele\Alumni + public function inscription(string $email, string $hashpassword): \App\metier\Alumni { $dsn = "mysql:host=localhost;dbname=dbAlica"; $username = "Dev"; @@ -43,11 +62,30 @@ class UtilisateurModele // Insérez le nouvel utilisateur dans la base de données en utilisant AlumniGateway if ($gate->insert($email, $hashpassword, $role)) { // L'insertion a réussi, retournez le nouvel utilisateur - $nouvelUtilisateur = new \App\modele\Alumni($email, $hashpassword, $role); + $nouvelUtilisateur = new \App\metier\Alumni($email, $hashpassword, $role); return $nouvelUtilisateur; } else { // L'insertion a échoué, renvoyez un utilisateur vide pour indiquer l'échec - return new \App\modele\Alumni(null, null, null); + return new \App\metier\Alumni(null, null, null); + } + } + + public function getUtilisateurByEmail(string $email) + { + $dsn = "mysql:host=localhost;dbname=dbAlica"; + $username = "Dev"; + $password = "Dev"; + + $con = new \App\gateway\Connection($dsn, $username, $password); + $gate = new \App\gateway\AlumniGateway($con); + // Récupérez l'utilisateur avec l'email donné en utilisant AlumniGateway + $utilisateur = $gate->findByEmail($email); + if ($utilisateur instanceof \App\metier\Alumni) { + // L'utilisateur existe, retournez-le + return $utilisateur; + } else { + // L'utilisateur n'existe pas, renvoyez null + return null; } } } diff --git a/php/templates/accueil.html b/php/templates/accueil.html index 1438392..18b3aa3 100755 --- a/php/templates/accueil.html +++ b/php/templates/accueil.html @@ -10,6 +10,8 @@

Accueil

+ +

Bienvenue {{session.mail}}

Vous êtes sur la page d'accueil

Vous pouvez vous connecter ou vous inscrire

Vous pouvez aussi consulter les articles

@@ -22,3 +24,4 @@ + diff --git a/php/templates/connexion.html b/php/templates/connection.html similarity index 95% rename from php/templates/connexion.html rename to php/templates/connection.html index 2dd061a..5d90cbe 100755 --- a/php/templates/connexion.html +++ b/php/templates/connection.html @@ -16,7 +16,7 @@
- +
From a9afecf68a2b3f6033314ca196465981c24fa839 Mon Sep 17 00:00:00 2001 From: Leo Tuaillon Date: Tue, 7 Nov 2023 14:19:56 +0100 Subject: [PATCH 2/4] connection + deconnection fonctionnelles --- php/public/assets/logo.png | Bin 0 -> 34574 bytes php/public/css/menu.css | 145 +++++++++++++++++++ php/public/index.php | 5 +- php/src/controleur/FrontControleur.php | 5 +- php/src/controleur/MembreControleur.php | 10 +- php/src/controleur/UtilisateurControleur.php | 12 +- php/src/gateway/AlumniGateway.php | 6 + php/src/modele/UtilisateurModele.php | 9 +- php/templates/accueil.html | 9 +- php/templates/menu.html | 37 +++++ 10 files changed, 223 insertions(+), 15 deletions(-) create mode 100644 php/public/assets/logo.png create mode 100644 php/public/css/menu.css create mode 100644 php/templates/menu.html diff --git a/php/public/assets/logo.png b/php/public/assets/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..d272825ec4ee1bc80e6dc583deb622b0fe860cb2 GIT binary patch literal 34574 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 false, 'debug' => true ]); - -$cont = new \App\controleur\FrontControleur(); \ No newline at end of file +$twig->addExtension(new \Twig\Extension\DebugExtension()); +$cont = new \App\controleur\FrontControleur(); +//end session \ No newline at end of file diff --git a/php/src/controleur/FrontControleur.php b/php/src/controleur/FrontControleur.php index 0fe94ad..791f1f5 100755 --- a/php/src/controleur/FrontControleur.php +++ b/php/src/controleur/FrontControleur.php @@ -16,7 +16,7 @@ class FrontControleur //TODO ], "Membre" => [ - "deconnexion","proposerOffre","consulterProfil","modifierProfil","signaler" + "deconnection","proposerOffre","consulterProfil","modifierProfil","signaler", ], "Utilisateur" => [ "connection", "inscription", "accueil","consulterProfilLimite" @@ -41,10 +41,11 @@ class FrontControleur } } else if(in_array($action,$actions['Membre'])) { - if (!isset($_SESSION["login"])) { + if (!isset($_SESSION["utilisateur"])) { $dVueErreur[] = 'Veuillez vous connecter'; echo $twig->render('erreur.html', ['dVueErreur' => $dVueErreur]); } else{ + echo "controlleur membre instancié"; new MembreControleur(); } }else{ diff --git a/php/src/controleur/MembreControleur.php b/php/src/controleur/MembreControleur.php index c0b83ff..f73641d 100755 --- a/php/src/controleur/MembreControleur.php +++ b/php/src/controleur/MembreControleur.php @@ -12,8 +12,8 @@ class MembreControleur extends UtilisateurControleur $action = \App\config\Validation::nettoyerString($_REQUEST["action"]); } switch ($action) { - case "deconnexion": - $this->deconnexion(); + case "deconnection": + $this->deconnection(); break; case "proposerOffre": $this->proposerOffre(); @@ -32,9 +32,11 @@ class MembreControleur extends UtilisateurControleur } } - protected function deconnexion() + protected function deconnection() { - //TODO + session_destroy(); + header('Location: index.php?action=accueil'); + exit(); } protected function proposerOffre() diff --git a/php/src/controleur/UtilisateurControleur.php b/php/src/controleur/UtilisateurControleur.php index 5df7d7d..2bf0eea 100755 --- a/php/src/controleur/UtilisateurControleur.php +++ b/php/src/controleur/UtilisateurControleur.php @@ -28,7 +28,7 @@ class UtilisateurControleur $this->consulterProfilLimite(); break; default: - $dVueErreur[] ="Action inconnue ou non autorisée"; + $dVueErreur[] ="Action rjhghuiergiuhou non autorisée"; echo $twig->render("erreur.html",['dVueErreur' => $dVueErreur]); } @@ -89,9 +89,17 @@ class UtilisateurControleur protected function accueil() { global $twig; - echo $twig->render('accueil.html', []); + // Ajout d'un var_dump pour déboguer + if (isset($_SESSION['utilisateur']) && $_SESSION['utilisateur'] instanceof \App\metier\Alumni) { + $pseudo = $_SESSION['utilisateur']->getEmail(); // ou getPseudo() si la méthode existe + } else { + $pseudo = null; + } + + echo $twig->render('accueil.html', ['pseudo' => $pseudo]); } + protected function consulterProfilLimite() { //TODO diff --git a/php/src/gateway/AlumniGateway.php b/php/src/gateway/AlumniGateway.php index 9f140bc..59b9033 100644 --- a/php/src/gateway/AlumniGateway.php +++ b/php/src/gateway/AlumniGateway.php @@ -69,6 +69,12 @@ class AlumniGateway ':e' => array($email, PDO::PARAM_STR), )); $res=$this->con->getResults(); + var_dump($res); + if(count($res)==0){ + echo "Aucun utilisateur trouvé"; + return null; + } + echo "Utilisateur trouvé"; return new \App\metier\Alumni($res[0]['mail'],$res[0]['mdp'],$res[0]['role']); } diff --git a/php/src/modele/UtilisateurModele.php b/php/src/modele/UtilisateurModele.php index e11d866..b4f7cff 100755 --- a/php/src/modele/UtilisateurModele.php +++ b/php/src/modele/UtilisateurModele.php @@ -18,7 +18,7 @@ class UtilisateurModele * @param string hash * @return \App\metier\Alumni */ - public function connection(string $email, string $hash) : \App\metier\Alumni + public function connection(string $email, string $hash) : ? \App\metier\Alumni { $dsn = "mysql:host=localhost;dbname=dbAlica"; $username = "Dev"; @@ -32,14 +32,15 @@ class UtilisateurModele // L'utilisateur existe, vérifiez le mot de passe if ($hash==$utilisateur->getPassword()) { // Le mot de passe est correct, retournez l'utilisateur + session_start(); return $utilisateur; } else { // Le mot de passe est incorrect, renvoyez null - return new \App\metier\Alumni(null, null, null); + return null; } } else { // L'utilisateur n'existe pas, renvoyez null - return new \App\metier\Alumni(null, null, null); + return null; } } @@ -56,7 +57,7 @@ class UtilisateurModele $username = "Dev"; $password = "Dev"; - $role = "Utilisateur"; + $role = "Membre"; $con = new \App\gateway\Connection($dsn, $username, $password); $gate = new \App\gateway\AlumniGateway($con); // Insérez le nouvel utilisateur dans la base de données en utilisant AlumniGateway diff --git a/php/templates/accueil.html b/php/templates/accueil.html index 18b3aa3..87ab6bb 100755 --- a/php/templates/accueil.html +++ b/php/templates/accueil.html @@ -9,9 +9,16 @@ +

+ {% include 'menu.html' %} +

Accueil

-

Bienvenue {{session.mail}}

+

{% if pseudo %} + Bienvenue, {{ pseudo }}! + {% else %} + Bienvenue, invité! + {% endif %}

Vous êtes sur la page d'accueil

Vous pouvez vous connecter ou vous inscrire

Vous pouvez aussi consulter les articles

diff --git a/php/templates/menu.html b/php/templates/menu.html new file mode 100644 index 0000000..603ceea --- /dev/null +++ b/php/templates/menu.html @@ -0,0 +1,37 @@ + + + + + + + + \ No newline at end of file From 206e3ef580ab0e63afe1e1e854bb7449e7c722e8 Mon Sep 17 00:00:00 2001 From: Leo Tuaillon Date: Sun, 12 Nov 2023 15:53:27 +0100 Subject: [PATCH 3/4] =?UTF-8?q?Inscription=20Connexion=20et=20deconnexion?= =?UTF-8?q?=20fonctionnelles=20avec=20cr=C3=A9ation=20du=20profil=20associ?= =?UTF-8?q?=C3=A9=20lors=20de=20l'inscription?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/alica.iml | 4 +- php/public/css/inscription_success.css | 102 +++++++++++++++++++ php/public/index.php | 2 +- php/src/controleur/UtilisateurControleur.php | 33 ++++-- php/src/gateway/AlumniGateway.php | 25 +++-- php/src/gateway/ProfilGateway.php | 26 +++++ php/src/metier/Alumni.php | 20 +++- php/src/metier/Profil.php | 28 ++--- php/src/modele/UtilisateurModele.php | 15 ++- php/templates/accueil.html | 25 +++-- php/templates/connection.html | 14 +++ php/templates/inscription.html | 38 ++++++- php/templates/inscription_success.html | 24 +++++ 13 files changed, 296 insertions(+), 60 deletions(-) mode change 100755 => 100644 .idea/alica.iml create mode 100644 php/public/css/inscription_success.css create mode 100644 php/src/gateway/ProfilGateway.php create mode 100644 php/templates/inscription_success.html diff --git a/.idea/alica.iml b/.idea/alica.iml old mode 100755 new mode 100644 index 9a8e33d..816484e --- a/.idea/alica.iml +++ b/.idea/alica.iml @@ -2,9 +2,7 @@ - - - + diff --git a/php/public/css/inscription_success.css b/php/public/css/inscription_success.css new file mode 100644 index 0000000..86fa52c --- /dev/null +++ b/php/public/css/inscription_success.css @@ -0,0 +1,102 @@ +.three-body { + --uib-size: 500px; + --uib-speed: 0.8s; + --uib-color: #00DBFF; + position: relative; + display: inline-block; + height: var(--uib-size); + width: var(--uib-size); + animation: spin78236 calc(var(--uib-speed) * 2.5) infinite linear; +} + +.three-body__dot { + position: absolute; + height: 100%; + width: 30%; +} + +.three-body__dot:after { + content: ''; + position: absolute; + height: 0; + width: 100%; + padding-bottom: 100%; + background-color: var(--uib-color); + border-radius: 50%; +} + +.three-body__dot:nth-child(1) { + bottom: 5%; + left: 0; + transform: rotate(60deg); + transform-origin: 50% 85%; +} + +.three-body__dot:nth-child(1)::after { + bottom: 0; + left: 0; + animation: wobble1 var(--uib-speed) infinite ease-in-out; + animation-delay: calc(var(--uib-speed) * -0.3); +} + +.three-body__dot:nth-child(2) { + bottom: 5%; + right: 0; + transform: rotate(-60deg); + transform-origin: 50% 85%; +} + +.three-body__dot:nth-child(2)::after { + bottom: 0; + left: 0; + animation: wobble1 var(--uib-speed) infinite + calc(var(--uib-speed) * -0.15) ease-in-out; +} + +.three-body__dot:nth-child(3) { + bottom: -5%; + left: 0; + transform: translateX(116.666%); +} + +.three-body__dot:nth-child(3)::after { + top: 0; + left: 0; + animation: wobble2 var(--uib-speed) infinite ease-in-out; +} + +@keyframes spin78236 { + 0% { + transform: rotate(0deg); + } + + 100% { + transform: rotate(360deg); + } +} + +@keyframes wobble1 { + 0%, + 100% { + transform: translateY(0%) scale(1); + opacity: 1; + } + + 50% { + transform: translateY(-66%) scale(0.65); + opacity: 0.8; + } +} + +@keyframes wobble2 { + 0%, + 100% { + transform: translateY(0%) scale(1); + opacity: 1; + } + + 50% { + transform: translateY(66%) scale(0.65); + opacity: 0.8; + } +} diff --git a/php/public/index.php b/php/public/index.php index 6158841..d0ad525 100755 --- a/php/public/index.php +++ b/php/public/index.php @@ -1,4 +1,4 @@ -accueil(); break; + case "inscription_success": + $this->inscription_success(); + break; case "connection": $this->connection(); break; @@ -28,7 +31,7 @@ class UtilisateurControleur $this->consulterProfilLimite(); break; default: - $dVueErreur[] ="Action rjhghuiergiuhou non autorisée"; + $dVueErreur[] ="Action non autorisée"; echo $twig->render("erreur.html",['dVueErreur' => $dVueErreur]); } @@ -59,22 +62,24 @@ class UtilisateurControleur { global $twig; $dVueErreur = []; // Tableau pour stocker les erreurs, le cas échéant + $userModel = new \App\modele\UtilisateurModele(); - if (isset($_POST['email'], $_POST['username'], $_POST['password'])) { + if (isset($_POST['firstname'],$_POST['name'], $_POST['email'], $_POST['password'])) { + $nom = \App\config\Validation::nettoyerString($_POST['name']); + $prenom = \App\config\Validation::nettoyerString($_POST['firstname']); $email = \App\config\Validation::nettoyerString($_POST['email']); $motDePasse = \App\config\Validation::nettoyerString($_POST['password']); + // verification que l'email est valide et unique : if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { - $dVueErreur[] = "L'adresse email n'est pas valide."; + $dVueErreur[] = "L'adresse email n'est pas valide ou est déjà utilisée."; } else { - $userModel = new \App\modele\UtilisateurModele(); $utilisateur = $userModel->getUtilisateurByEmail($email); if ($utilisateur instanceof \App\metier\Alumni) { $dVueErreur[] = "L'adresse email est déjà utilisée."; } } - $userModel = new \App\modele\UtilisateurModele(); - $nouvelUtilisateur = $userModel->inscription($email, $motDePasse); + $nouvelUtilisateur = $userModel->inscription($prenom,$nom,$email, $motDePasse); if ($nouvelUtilisateur instanceof \App\metier\Alumni) { header('Location: index.php?action=inscription_success'); @@ -91,15 +96,21 @@ class UtilisateurControleur global $twig; // Ajout d'un var_dump pour déboguer if (isset($_SESSION['utilisateur']) && $_SESSION['utilisateur'] instanceof \App\metier\Alumni) { - $pseudo = $_SESSION['utilisateur']->getEmail(); // ou getPseudo() si la méthode existe + $prenom = $_SESSION['utilisateur']->getPrenom(); + $nom = $_SESSION['utilisateur']->getNom(); } else { - $pseudo = null; + $prenom = "Utilisateur"; + $nom = "inconnu"; } - - echo $twig->render('accueil.html', ['pseudo' => $pseudo]); + //aller sur la page d'accueil avec le nom et prenom de l'utilisateur + echo $twig->render('accueil.html', ['prenom' => $prenom, 'nom' => $nom]); } - + protected function inscription_success() + { + global $twig; + echo $twig->render('inscription_success.html'); + } protected function consulterProfilLimite() { //TODO diff --git a/php/src/gateway/AlumniGateway.php b/php/src/gateway/AlumniGateway.php index 59b9033..dbc4dee 100644 --- a/php/src/gateway/AlumniGateway.php +++ b/php/src/gateway/AlumniGateway.php @@ -64,20 +64,21 @@ class AlumniGateway } public function findByEmail(string $email){ - $query='SELECT * FROM Alumni WHERE mail=:e'; + $query = 'SELECT Alumni.mail, Alumni.mdp, Alumni.role, Profil.nom, Profil.prenom + FROM Alumni + LEFT JOIN Profil ON Alumni.id = Profil.alumni + WHERE Alumni.mail = :e'; $this->con->executeQuery($query, array( ':e' => array($email, PDO::PARAM_STR), )); - $res=$this->con->getResults(); - var_dump($res); - if(count($res)==0){ - echo "Aucun utilisateur trouvé"; + $res = $this->con->getResults(); + if (count($res) == 0) { return null; } - echo "Utilisateur trouvé"; - return new \App\metier\Alumni($res[0]['mail'],$res[0]['mdp'],$res[0]['role']); + return new \App\metier\Alumni($res[0]['mail'], $res[0]['mdp'], $res[0]['role'], $res[0]['nom'], $res[0]['prenom']); } + public function getAll(){ $query='SELECT * FROM Alumni'; $this->con->executeQuery($query); @@ -88,4 +89,14 @@ class AlumniGateway } return $array; } + + public function getID(string $email) + { + $query = 'SELECT id FROM Alumni WHERE mail=:e'; + $this->con->executeQuery($query, array( + ':e' => array($email, PDO::PARAM_STR), + )); + $res = $this->con->getResults(); + return $res[0]['id']; + } } \ No newline at end of file diff --git a/php/src/gateway/ProfilGateway.php b/php/src/gateway/ProfilGateway.php new file mode 100644 index 0000000..abee520 --- /dev/null +++ b/php/src/gateway/ProfilGateway.php @@ -0,0 +1,26 @@ +con = $con; + } + + public function insert(int $alumni,string $nom, string $prenom, string $email) + { + $query = 'INSERT INTO Profil (alumni,nom, prenom,email) VALUES (:alumni,:nom, :prenom,:email)'; + return $this->con->executeQuery($query, array( + ':alumni' => array($alumni, PDO::PARAM_INT), + ':nom' => array($nom, PDO::PARAM_STR), + ':prenom' => array($prenom, PDO::PARAM_STR), + ':email' => array($email, PDO::PARAM_STR) + )); + } +} \ No newline at end of file diff --git a/php/src/metier/Alumni.php b/php/src/metier/Alumni.php index d1ac2fe..3f25d43 100644 --- a/php/src/metier/Alumni.php +++ b/php/src/metier/Alumni.php @@ -18,16 +18,20 @@ class Alumni{ */ private String $role; + private Profil $profil; + /** * @param string $email * @param string $motDePasse * @param String $role + * @param Profil $profil */ - public function __construct(string $email, string $motDePasse, String $role) + public function __construct(string $email, string $motDePasse, String $role, string $nom, string $prenom) { $this->email = $email; $this->motDePasse = $motDePasse; $this->role = $role; + $this->profil = new Profil($nom, $prenom, $email, "","", "", ""); } /** @@ -38,6 +42,10 @@ class Alumni{ return $this->email; } + public function getProfil() : Profil + { + return $this->profil; + } /** * @return string */ @@ -55,4 +63,14 @@ class Alumni{ { return $this->motDePasse; } + + public function getPrenom() + { + return $this->profil->getPrenom(); + } + + public function getNom() + { + return $this->profil->getNom(); + } } \ No newline at end of file diff --git a/php/src/metier/Profil.php b/php/src/metier/Profil.php index cee762c..8fef2ee 100644 --- a/php/src/metier/Profil.php +++ b/php/src/metier/Profil.php @@ -8,10 +8,6 @@ class Profil */ private int $id; - /** - * @var Alumni Compte - */ - private Alumni $alumni; /** * @var string CV @@ -28,6 +24,7 @@ class Profil */ private string $prenom; + private string $email; /** * @var string Url linkedin */ @@ -44,8 +41,6 @@ class Profil private string $portfolioUrl; /** - * @param int $id - * @param Alumni $alumni * @param string $cv * @param string $nom * @param string $prenom @@ -53,27 +48,18 @@ class Profil * @param string $githubUrl * @param string $portfolioUrl */ - public function __construct(int $id, Alumni $alumni, string $cv, string $nom, string $prenom, string $linkedinUrl, string $githubUrl, string $portfolioUrl) + public function __construct(string $nom, string $prenom, string $email, string $cv, string $linkedinUrl, string $githubUrl, string $portfolioUrl) { - $this->id = $id; - $this->alumni = $alumni; - $this->cv = $cv; + $this->nom = $nom; $this->prenom = $prenom; + $this->email = $email; + $this->cv = $cv; $this->linkedinUrl = $linkedinUrl; $this->githubUrl = $githubUrl; $this->portfolioUrl = $portfolioUrl; } - public function getId(): int - { - return $this->id; - } - - public function getAlumni(): Alumni - { - return $this->alumni; - } public function getCv(): string { @@ -100,6 +86,10 @@ class Profil return $this->githubUrl; } + public function getEmail(): string + { + return $this->email; + } public function getPortfolioUrl(): string { return $this->portfolioUrl; diff --git a/php/src/modele/UtilisateurModele.php b/php/src/modele/UtilisateurModele.php index b4f7cff..9d2fd1d 100755 --- a/php/src/modele/UtilisateurModele.php +++ b/php/src/modele/UtilisateurModele.php @@ -51,7 +51,7 @@ class UtilisateurModele * @param string $pseudo * @return \Alumni chargé */ - public function inscription(string $email, string $hashpassword): \App\metier\Alumni + public function inscription(string $prenom, string $nom,string $email, string $hashpassword):? \App\metier\Alumni { $dsn = "mysql:host=localhost;dbname=dbAlica"; $username = "Dev"; @@ -60,14 +60,19 @@ class UtilisateurModele $role = "Membre"; $con = new \App\gateway\Connection($dsn, $username, $password); $gate = new \App\gateway\AlumniGateway($con); + $profilGate = new \App\gateway\ProfilGateway($con); // Insérez le nouvel utilisateur dans la base de données en utilisant AlumniGateway if ($gate->insert($email, $hashpassword, $role)) { - // L'insertion a réussi, retournez le nouvel utilisateur - $nouvelUtilisateur = new \App\metier\Alumni($email, $hashpassword, $role); - return $nouvelUtilisateur; + $alumni = $gate->getID($email); + if($profilGate->insert($alumni,$nom, $prenom,$email)){ + // L'insertion a réussi, retournez le nouvel utilisateur + $nouvelUtilisateur = new \App\metier\Alumni($email, $hashpassword, $role,$nom,$prenom); + return $nouvelUtilisateur; + } + return null; } else { // L'insertion a échoué, renvoyez un utilisateur vide pour indiquer l'échec - return new \App\metier\Alumni(null, null, null); + return null; } } diff --git a/php/templates/accueil.html b/php/templates/accueil.html index 87ab6bb..6994331 100755 --- a/php/templates/accueil.html +++ b/php/templates/accueil.html @@ -14,19 +14,26 @@

Accueil

-

{% if pseudo %} - Bienvenue, {{ pseudo }}! +

{% if prenom and nom %} + Bienvenue, {{ prenom }} {{ nom }}! {% else %} Bienvenue, invité! {% endif %}

Vous êtes sur la page d'accueil

-

Vous pouvez vous connecter ou vous inscrire

-

Vous pouvez aussi consulter les articles

-

Vous pouvez aussi consulter les annonces

-

Connexion :

-
- -
+ {% if dVueErreur is not empty %} +
+
+
+
    + {% for erreur in dVueErreur %} +
  • {{ erreur }}
    • + {% endfor %} +
+
+
+
+ {% endif %} + diff --git a/php/templates/connection.html b/php/templates/connection.html index 5d90cbe..20bc8d3 100755 --- a/php/templates/connection.html +++ b/php/templates/connection.html @@ -35,6 +35,7 @@
+
@@ -42,6 +43,19 @@
+ {% if dVueErreur is not empty %} +
+
+
+
    + {% for erreur in dVueErreur %} +
  • {{ erreur }}
    • + {% endfor %} +
+
+
+
+ {% endif %} diff --git a/php/templates/inscription.html b/php/templates/inscription.html index b86bcea..a22ee4b 100755 --- a/php/templates/inscription.html +++ b/php/templates/inscription.html @@ -11,12 +11,25 @@

S'inscrire

- Identifiant + Prénom :
- + +
+
+
+ Nom : +
+
+ +
+
@@ -25,7 +38,9 @@
- +
@@ -34,7 +49,9 @@
- +
@@ -50,6 +67,19 @@
+ {% if dVueErreur is not empty %} +
+
+
+
    + {% for erreur in dVueErreur %} +
  • {{ erreur }}
    • + {% endfor %} +
+
+
+
+ {% endif %} diff --git a/php/templates/inscription_success.html b/php/templates/inscription_success.html new file mode 100644 index 0000000..3e1f2b3 --- /dev/null +++ b/php/templates/inscription_success.html @@ -0,0 +1,24 @@ + + + + + Success + + + +

Inscription effectuée avec succès, vous pouvez désormais vous connecter

+

Vous allez être redirigé vers la page de connexion dans 5 secondes

+
+
+
+
+
+ + + + + \ No newline at end of file From d9ea1e83b738aadbb96bd0b330e696e4d313b500 Mon Sep 17 00:00:00 2001 From: Leo Tuaillon Date: Wed, 15 Nov 2023 12:58:35 +0100 Subject: [PATCH 4/4] password hash --- php/src/controleur/FrontControleur.php | 5 ++--- php/src/controleur/MembreControleur.php | 6 +++--- php/src/controleur/UtilisateurControleur.php | 12 +++++++----- php/src/modele/UtilisateurModele.php | 4 ++-- php/templates/menu.html | 4 ++-- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/php/src/controleur/FrontControleur.php b/php/src/controleur/FrontControleur.php index 791f1f5..58b83e8 100755 --- a/php/src/controleur/FrontControleur.php +++ b/php/src/controleur/FrontControleur.php @@ -16,10 +16,10 @@ class FrontControleur //TODO ], "Membre" => [ - "deconnection","proposerOffre","consulterProfil","modifierProfil","signaler", + "deconnexion","proposerOffre","consulterProfil","modifierProfil","signaler", ], "Utilisateur" => [ - "connection", "inscription", "accueil","consulterProfilLimite" + "connexion", "inscription", "accueil","consulterProfilLimite" ] ); @@ -45,7 +45,6 @@ class FrontControleur $dVueErreur[] = 'Veuillez vous connecter'; echo $twig->render('erreur.html', ['dVueErreur' => $dVueErreur]); } else{ - echo "controlleur membre instancié"; new MembreControleur(); } }else{ diff --git a/php/src/controleur/MembreControleur.php b/php/src/controleur/MembreControleur.php index f73641d..151c410 100755 --- a/php/src/controleur/MembreControleur.php +++ b/php/src/controleur/MembreControleur.php @@ -12,8 +12,8 @@ class MembreControleur extends UtilisateurControleur $action = \App\config\Validation::nettoyerString($_REQUEST["action"]); } switch ($action) { - case "deconnection": - $this->deconnection(); + case "deconnexion": + $this->deconnexion(); break; case "proposerOffre": $this->proposerOffre(); @@ -32,7 +32,7 @@ class MembreControleur extends UtilisateurControleur } } - protected function deconnection() + protected function deconnexion() { session_destroy(); header('Location: index.php?action=accueil'); diff --git a/php/src/controleur/UtilisateurControleur.php b/php/src/controleur/UtilisateurControleur.php index 5ca0ff1..fceb133 100755 --- a/php/src/controleur/UtilisateurControleur.php +++ b/php/src/controleur/UtilisateurControleur.php @@ -41,11 +41,11 @@ class UtilisateurControleur { global $twig; $dVueErreur = []; // Tableau pour stocker les erreurs, le cas échéant + $userModel = new \App\modele\UtilisateurModele(); if (isset($_POST['email'], $_POST['password'])) { $email = \App\config\Validation::nettoyerString($_POST['email']); $motDePasse = \App\config\Validation::nettoyerString($_POST['password']); - $userModel = new \App\modele\UtilisateurModele(); $utilisateur = $userModel->connection($email, $motDePasse); if ($utilisateur instanceof \App\metier\Alumni) { $_SESSION['utilisateur'] = $utilisateur; @@ -69,6 +69,7 @@ class UtilisateurControleur $prenom = \App\config\Validation::nettoyerString($_POST['firstname']); $email = \App\config\Validation::nettoyerString($_POST['email']); $motDePasse = \App\config\Validation::nettoyerString($_POST['password']); + $hash = password_hash($motDePasse, PASSWORD_DEFAULT); // verification que l'email est valide et unique : if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { @@ -79,7 +80,7 @@ class UtilisateurControleur $dVueErreur[] = "L'adresse email est déjà utilisée."; } } - $nouvelUtilisateur = $userModel->inscription($prenom,$nom,$email, $motDePasse); + $nouvelUtilisateur = $userModel->inscription($prenom,$nom,$email, $hash); if ($nouvelUtilisateur instanceof \App\metier\Alumni) { header('Location: index.php?action=inscription_success'); @@ -98,9 +99,10 @@ class UtilisateurControleur if (isset($_SESSION['utilisateur']) && $_SESSION['utilisateur'] instanceof \App\metier\Alumni) { $prenom = $_SESSION['utilisateur']->getPrenom(); $nom = $_SESSION['utilisateur']->getNom(); - } else { - $prenom = "Utilisateur"; - $nom = "inconnu"; + } + else{ + $prenom = null; + $nom = null; } //aller sur la page d'accueil avec le nom et prenom de l'utilisateur echo $twig->render('accueil.html', ['prenom' => $prenom, 'nom' => $nom]); diff --git a/php/src/modele/UtilisateurModele.php b/php/src/modele/UtilisateurModele.php index 9d2fd1d..e4d9a06 100755 --- a/php/src/modele/UtilisateurModele.php +++ b/php/src/modele/UtilisateurModele.php @@ -18,7 +18,7 @@ class UtilisateurModele * @param string hash * @return \App\metier\Alumni */ - public function connection(string $email, string $hash) : ? \App\metier\Alumni + public function connection(string $email, string $mdp) : ? \App\metier\Alumni { $dsn = "mysql:host=localhost;dbname=dbAlica"; $username = "Dev"; @@ -30,7 +30,7 @@ class UtilisateurModele $utilisateur = $gate->findByEmail($email); if ($utilisateur instanceof \App\metier\Alumni) { // L'utilisateur existe, vérifiez le mot de passe - if ($hash==$utilisateur->getPassword()) { + if (password_verify($mdp, $utilisateur->getPassword())) { // Le mot de passe est correct, retournez l'utilisateur session_start(); return $utilisateur; diff --git a/php/templates/menu.html b/php/templates/menu.html index 603ceea..9788900 100644 --- a/php/templates/menu.html +++ b/php/templates/menu.html @@ -23,9 +23,9 @@