diff --git a/Project/db/defaultinsert.sql b/Project/db/defaultinsert.sql index 30b6eaa..53fef82 100755 --- a/Project/db/defaultinsert.sql +++ b/Project/db/defaultinsert.sql @@ -18,23 +18,29 @@ INSERT INTO User_ VALUES (1, "Password*123", "francois.dupont@etu.uca.fr", "Fran INSERT INTO User_ VALUES (2, "Password*123", "sylvain.volvic@etu.uca.fr", "Sylvain", "Volvic", "sylvaincpt", "", true, 1); INSERT INTO User_ VALUES (3, "Password*123", "jean.bombeur@etu.uca.fr", "Jean", "Bombeur", "jambombeurre", "", false, 2); INSERT INTO User_ VALUES (6, "Password*123", "tony.tonic@etu.uca.fr", "Tony", "Tonic", "tonytonic", "", false, 3); +INSERT INTO User_ VALUES (10, "$2y$10$RHgtbmnMWixD/ztTz55L9elDisjiyDy.NobsWa8L8pzYDgQYJGL.y", "student@uca.fr", "Student", "UCA", "student", "", NULL, NULL); -- User : teacher INSERT INTO User_ VALUES (5, "Password*123", "michel.singinou@ext.uca.fr", "Michel", "Singinou", "mich", "", NULL, NULL); +INSERT INTO User_ VALUES (20, "$2y$10$vvY7Dny2Qt0LdRgIxcZ.5uZ3LygRd1hMhqtjjj/v5tF57yos0JEmG", "teacher@uca.fr", "Teacher", "UCA", "teacher", "", NULL, NULL); -- User : admin -INSERT INTO User_ VALUES (4, "admin", "admin@uca.fr", "Admin", "UCA", "admin", "", NULL, NULL); +INSERT INTO User_ VALUES (30, "$2y$10$STTT3uR83dcwduiqqyKRde3b02LQi9iavkzn47NbA.xUrt92PalgW", "admin@uca.fr", "Admin", "UCA", "admin", "", NULL, NULL); -- Role attribution INSERT INTO Be VALUES (1, 3); INSERT INTO Be VALUES (2, 3); INSERT INTO Be VALUES (3, 3); INSERT INTO Be VALUES (6, 3); +INSERT INTO Be VALUES (10, 3); + INSERT INTO Be VALUES (4, 1); INSERT INTO Be VALUES (4, 2); +INSERT INTO Be VALUES (20, 2); INSERT INTO Be VALUES (5, 2); +INSERT INTO Be VALUES (30, 1); -- Vocabulary list INSERT INTO VocabularyList VALUES (1, "Animaux", "", 5); diff --git a/Project/php/config/config.php b/Project/php/config/config.php index 789e597..0fbb5bc 100755 --- a/Project/php/config/config.php +++ b/Project/php/config/config.php @@ -18,4 +18,4 @@ global $password; $password = 'achanger'; global $altorouterPath; -$altorouterPath = "/~anrichard7/SAE_2A_Anglais/Project/php"; +$altorouterPath = "/SAE_2A_Anglais/Project/php"; diff --git a/Project/php/controller/FrontController.php b/Project/php/controller/FrontController.php index 8957091..7dba54d 100755 --- a/Project/php/controller/FrontController.php +++ b/Project/php/controller/FrontController.php @@ -4,6 +4,7 @@ namespace controller; use config\Validation; use Exception; +use model\MdlStudent; class FrontController { @@ -16,11 +17,6 @@ class FrontController var_dump($_SESSION['login']); var_dump($_SESSION['roles']); - if (!is_writable(session_save_path())) { - echo 'Session path "'.session_save_path().'" is not writable for PHP!'; - } - else echo "good"; - try { $router = new \AltoRouter(); $router->setBasePath($altorouterPath); @@ -40,11 +36,11 @@ class FrontController switch ($action) { case null: - echo $twig->render('home.html'); + $this->home(); break; case 'login': - echo $twig->render('login.html'); + $this->login(); break; case 'confirmLogin': @@ -67,7 +63,21 @@ class FrontController } } - public function confirmLogin(): void { + public function home(): void { + global $twig; + echo $twig->render('home.html'); + } + public function login(): void { + global $twig; + echo $twig->render('login.html'); + } + + public function confirmLogin(): void { + $model = new MdlStudent(); + $login = strip_tags($_POST['logemail']); + $password = strip_tags($_POST['logpass']); + $user = $model->connection($login, $password); + $this->home(); } } \ No newline at end of file diff --git a/Project/php/gateway/UserGateway.php b/Project/php/gateway/UserGateway.php index 02e54f4..fee192a 100755 --- a/Project/php/gateway/UserGateway.php +++ b/Project/php/gateway/UserGateway.php @@ -147,12 +147,12 @@ class UserGateway extends AbsGateway } } - public function login(string $login) : array{ + public function login(string $login) : string{ try { $query = "SELECT password FROM User_ WHERE email=:email"; $args = array(':email' => array($login, PDO::PARAM_STR)); $this->con->executeQuery($query, $args); - return $this->con->getResults(); + return $this->con->getResults()[0]['password']; } catch(PDOException $e ){ throw new Exception($e->getMessage()); diff --git a/Project/php/model/AbsModel.php b/Project/php/model/AbsModel.php index 8c07555..b9a2ecb 100755 --- a/Project/php/model/AbsModel.php +++ b/Project/php/model/AbsModel.php @@ -17,18 +17,20 @@ abstract class AbsModel } public function connection(string $login, string $password){ - $cleanedLogin = strip_tags($login); - $cleanedPassword = strip_tags($password); $gtw = new UserGateway(); + $hash = $gtw->login($login) ?? null; + + if ($hash != null && password_verify($password, $hash)) { + $user = $gtw->findUserByEmail($login); + $_SESSION['login'] = $login; - if (password_verify($cleanedPassword, $gtw->login($cleanedLogin)[0][0])) { - $user = $gtw->findUserByEmail($cleanedLogin); - $_SESSION['login'] = $cleanedLogin; $roles = array(); - foreach ($roles as $role) $roles[] = $role; + foreach ($user->getRoles() as $role) $roles[] = $role; $_SESSION['roles'] = $roles; + return $user; } + return null; } diff --git a/Project/php/templates/login.html b/Project/php/templates/login.html index c824c10..3b56b83 100755 --- a/Project/php/templates/login.html +++ b/Project/php/templates/login.html @@ -24,16 +24,18 @@

Log In

-
- - -
-
- - -
- submit -

Forgot your password?

+
+
+ + +
+
+ + +
+ +

Forgot your password?

+