Merge branch 'issue_16_statistics_coach' of https://codefirst.iut.uca.fr/git/FitDev/Projet_fit_web into issue_16_statistics_coach

Sources/config/config.php

@@ -17,3 +17,4 @@ const DB_PASSWORD =  'achanger';
 const APP_ENV = 'console';
 
 const DSN = "mysql:host=" . DB_HOST . ";dbname=" . DB_DATABASE;
+

Sources/src/console/Console.php

@@ -8,6 +8,7 @@ use Model\Role;
 use Stub\StubData;
 use Manager\DataManager;
 
+
 $model = new StubData(); // Couche d'accès au model
 function clearScreen()
 {

Sources/src/data/core/network/IAuthService.php

@@ -1,5 +1,7 @@
 <?php
 namespace Network;
+use Model\User;
+
 /**
  *  Interface IAuthService
  *  Adding more methods here may violate the Single Responsibility Principle (SRP).
@@ -12,9 +14,9 @@ interface IAuthService {
      * @param string $username The username of the user.
      * @param string $password The password of the user.
      *
-     * @return bool True if authentication is successful, false otherwise.
+     * @return ?User True if authentication is successful, false otherwise.
      */
-    public function login(string $username, string $password): bool;
+    public function login(string $username, string $password): ?User;
 
      /**
      * Register a new user.

Sources/src/data/model/manager/CoachManager.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace Manager;
+
+class CoachManager
+{
+    function __construct() {
+
+    }
+}

Sources/src/data/model/manager/DataManager.php

@@ -3,6 +3,7 @@ namespace Manager;
 
 abstract class DataManager {
     public $userMgr;
+    public $coachMgr;
 
 }
 

Sources/src/data/model/manager/UserManager.php

@@ -3,6 +3,7 @@ namespace Manager;
 
 use Model\Athlete;
 use Model\Coach;
+use Model\User;
 use Network\IAuthService;
 use Shared\Validation;
 
@@ -11,6 +12,7 @@ use Shared\Validation;
 class UserManager
 {
     private IAuthService $authService;
+    public User $currentUser;
     public function __construct(IAuthService $authService)
     {
         $this->authService = $authService;
@@ -18,10 +20,11 @@ class UserManager
 
     public function login($loginUser, $passwordUser): bool
     {
-        
         if (!Validation::val_string($passwordUser) || !Validation::val_string($loginUser))
             throw new \Exception(" some wrong with cred !!!!!");
-        if ($this->authService->login($loginUser, $passwordUser)) {
+        $user = $this->authService->login($loginUser, $passwordUser);
+        if ($user) {
+            $this->currentUser = $user;
             return true;
         }
         return false;

Sources/src/data/stub/StubData.php

@@ -2,13 +2,17 @@
 namespace Stub;
 use Shared\HashPassword;
 use Stub\AuthService;
-use Manager\DataManager;
-use Manager\UserManager;
+use Manager\{CoachManager, DataManager, UserManager};
 use Stub\UserRepository;
 
 class StubData extends DataManager{
     public function __construct(){
         $this->userMgr = new UserManager(new AuthService(new UserRepository(),new HashPassword()));
+        if($this->userMgr->currentUser->Role)
+        $this->coachMgr = new CoachManager();
+//        if(user.Role is instance of Coach) {
+//            this->CoachMgr = new CoachManager();
+//        }
     }
 }
 

Sources/src/data/stub/service/AuthService.php

@@ -16,17 +16,16 @@ class AuthService implements IAuthService {
         $this->passwordHasher = $passwordHasher;
     }
 
-    public function login(string $username,string $password): bool {
+    public function login(string $username,string $password): ?User {
         $user = $this->userRepository->GetItemByName($username,0,1);
 
         if ($user == null || !$user instanceof User) {
             throw new \Exception('Unable to find user with that name');
         }
         if ($user->isValidPassword($password)) {
-            return true;
+            return $user;
         }
-        
-        return false;
+        return null;
     }
     public function register(string $loginUser, string $password, $data): bool
     {

Sources/src/shared/Validation.php

@@ -26,7 +26,7 @@ final class Validation {
      * @throws Exception Si la chaîne n'est pas valide (tentative d'injection de code).
      */
     public static function val_string(string $string) : bool {
-        if (filter_var($string, FILTER_SANITIZE_STRING) !== $string) {
+        if (strlen(htmlspecialchars($string, ENT_QUOTES) === 0)) {
             throw new Exception("$string n'est pas valide. Tentative d'injection de code (attaque sécurité)!");
         } else {
             return true;

Sources/tests/DataManager/CoachManager.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace DataManager;
+
+class CoachManager
+{
+
+    /**
+     */
+    public function __construct()
+    {
+    }
+}