Message when everyone is verified

Reviewed-on: #7

.env

@@ -0,0 +1,63 @@
+# In all environments, the following files are loaded if they exist,
+# the latter taking precedence over the former:
+#
+#  * .env                contains default values for the environment variables needed by the app
+#  * .env.local          uncommitted file with local overrides
+#  * .env.$APP_ENV       committed environment-specific defaults
+#  * .env.$APP_ENV.local uncommitted environment-specific overrides
+#
+# Real environment variables win over .env files.
+#
+# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
+# https://symfony.com/doc/current/configuration/secrets.html
+#
+# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
+# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
+
+###> symfony/framework-bundle ###
+APP_ENV=dev
+APP_SECRET=
+###< symfony/framework-bundle ###
+
+###> doctrine/doctrine-bundle ###
+# Format described at https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/configuration.html#connecting-using-a-url
+# IMPORTANT: You MUST configure your server version, either here or in config/packages/doctrine.yaml
+#
+# DATABASE_URL="sqlite:///%kernel.project_dir%/var/data_%kernel.environment%.db"
+# DATABASE_URL="mysql://app:!ChangeMe!@127.0.0.1:3306/app?serverVersion=8.0.32&charset=utf8mb4"
+DATABASE_URL="mysql://escapepage:b.0nqrxJ%%2FD%%2ALuf9N@localhost:3306/escapepage?serverVersion=8.0.32&charset=utf8mb4"
+###< doctrine/doctrine-bundle ###
+
+###> symfony/messenger ###
+# Choose one of the transports below
+# MESSENGER_TRANSPORT_DSN=amqp://guest:guest@localhost:5672/%2f/messages
+# MESSENGER_TRANSPORT_DSN=redis://localhost:6379/messages
+MESSENGER_TRANSPORT_DSN=doctrine://default?auto_setup=0
+###< symfony/messenger ###
+
+###> symfony/mailer ###
+# Development: use Mailpit (docker compose override provides service `mailer` on port 1025)
+MAILER_DSN=smtp://mailer:1025
+# Production/Stage (uncomment and set SENDGRID_API_KEY in real env or secrets):
+# MAILER_DSN=sendgrid+api://%env(SENDGRID_API_KEY)%
+# Alternatively, via SMTP (no extra package needed):
+# MAILER_DSN="smtp://apikey:%env(SENDGRID_API_KEY)%@smtp.sendgrid.net:587?encryption=tls"
+# Optional default sender (used by test command if --from not passed):
+# MAILER_FROM=no-reply@your-domain.tld
+# SENDGRID_API_KEY=your_real_key_goes_here   # Do NOT commit this; set in .env.local or deployment env
+###< symfony/mailer ###
+
+###> symfony/sendgrid-mailer ###
+# MAILER_DSN=sendgrid://KEY@default
+###< symfony/sendgrid-mailer ###
+
+###> mercure ###
+# Internal hub URL used by the PHP app (reachable from the php container)
+MERCURE_URL=http://mercure/.well-known/mercure
+# Public hub URL used by browsers
+MERCURE_PUBLIC_URL=http://localhost:8090/.well-known/mercure
+# Shared secret for signing JWTs (dev only). In prod, set via real env/secrets.
+MERCURE_JWT_SECRET=!ChangeThisMercureJWTSignedBySymfonySecretKey!
+# Base URL for Mercure topics. Use .dev in development; override to .com in prod via .env.prod or real env.
+MERCURE_TOPIC_BASE=https://escapepage.dev
+###< mercure ###

.env.dev

@@ -0,0 +1,4 @@
+
+###> symfony/framework-bundle ###
+APP_SECRET=620e9ce5f88a714b636179eb39d5be4f
+###< symfony/framework-bundle ###

.env.prod

@@ -0,0 +1,9 @@
+### Compiled or real environment variables should be used in production.
+### Configure MAILER_DSN to use SendGrid API transport.
+### Prefer storing SENDGRID_API_KEY using Symfony Secrets or real env vars.
+
+###> symfony/mailer ###
+# Example using SendGrid API key (replace with real secret via vault/secrets):
+# SENDGRID_API_KEY=SG.xxxxx
+MAILER_DSN=sendgrid+api://%env(resolve:SENDGRID_API_KEY)%@default
+###< symfony/mailer ###

.env.test

@@ -0,0 +1,3 @@
+# define your env variables for the test env here
+KERNEL_CLASS='App\Kernel'
+APP_SECRET='$ecretf0rt3st'

src/Game/Controller/GameController.php

@@ -70,17 +70,6 @@ final class GameController extends AbstractController
                         $this->addFlash('error', 'Could not leave session (game might have started).');
                     }
                 }
-            } elseif ($request->request->has('start_session')) {
-                $sessionId = $request->request->get('session_id');
-                $session = $sessionRepository->find($sessionId);
-
-                if ($session) {
-                    if ($dashboardService->startSession($session)) {
-                        $this->addFlash('success', 'Session started! Screens have been assigned.');
-                    } else {
-                        $this->addFlash('error', 'Could not start session. Make sure all players have joined.');
-                    }
-                }
             }
 
             return $this->redirectToRoute('game_dashboard');

src/Game/Entity/Player.php

@@ -23,7 +23,7 @@ class Player
     #[ORM\JoinColumn(nullable: false)]
     private ?User $user = null;
 
-    #[ORM\Column(nullable: true)]
+    #[ORM\Column]
     private ?int $screen = null;
 
     public function getId(): ?int

src/Game/Enum/SessionSettingType.php

@@ -7,57 +7,19 @@ enum SessionSettingType: string
     case PWD_FOR_PLAYER1 = 'PwdForPlayer1';
     case PWD_FOR_PLAYER2 = 'PwdForPlayer2';
     case PWD_FOR_PLAYER3 = 'PwdForPlayer3';
-    case PWD_FOR_PLAYER4 = 'PwdForPlayer4';
-    case PWD_FOR_PLAYER5 = 'PwdForPlayer5';
-    case PWD_FOR_PLAYER6 = 'PwdForPlayer6';
-    case PWD_FOR_PLAYER7 = 'PwdForPlayer7';
-    case PWD_FOR_PLAYER8 = 'PwdForPlayer8';
-    case PWD_FOR_PLAYER9 = 'PwdForPlayer9';
-    case PWD_FOR_PLAYER10 = 'PwdForPlayer10';
     case RIGHTS_FOR_PLAYER1 = 'RightsForPlayer1';
     case RIGHTS_FOR_PLAYER2 = 'RightsForPlayer2';
     case RIGHTS_FOR_PLAYER3 = 'RightsForPlayer3';
-    case RIGHTS_FOR_PLAYER4 = 'RightsForPlayer4';
-    case RIGHTS_FOR_PLAYER5 = 'RightsForPlayer5';
-    case RIGHTS_FOR_PLAYER6 = 'RightsForPlayer6';
-    case RIGHTS_FOR_PLAYER7 = 'RightsForPlayer7';
-    case RIGHTS_FOR_PLAYER8 = 'RightsForPlayer8';
-    case RIGHTS_FOR_PLAYER9 = 'RightsForPlayer9';
-    case RIGHTS_FOR_PLAYER10 = 'RightsForPlayer10';
     case INVITE_CODE = 'InviteCode';
     case SET_OF_DELETED_FILES = 'SetOfDeletedFiles';
     case CHAT_TRACKING_FOR_PLAYER1 = 'ChatTrackingForPlayer1';
     case CHAT_TRACKING_FOR_PLAYER2 = 'ChatTrackingForPlayer2';
     case CHAT_TRACKING_FOR_PLAYER3 = 'ChatTrackingForPlayer3';
-    case CHAT_TRACKING_FOR_PLAYER4 = 'ChatTrackingForPlayer4';
-    case CHAT_TRACKING_FOR_PLAYER5 = 'ChatTrackingForPlayer5';
-    case CHAT_TRACKING_FOR_PLAYER6 = 'ChatTrackingForPlayer6';
-    case CHAT_TRACKING_FOR_PLAYER7 = 'ChatTrackingForPlayer7';
-    case CHAT_TRACKING_FOR_PLAYER8 = 'ChatTrackingForPlayer8';
-    case CHAT_TRACKING_FOR_PLAYER9 = 'ChatTrackingForPlayer9';
-    case CHAT_TRACKING_FOR_PLAYER10 = 'ChatTrackingForPlayer10';
     case VERIFY_CODES_FOR_PLAYER1 = 'VerifyCodesForPlayer1';
     case VERIFY_CODES_FOR_PLAYER2 = 'VerifyCodesForPlayer2';
     case VERIFY_CODES_FOR_PLAYER3 = 'VerifyCodesForPlayer3';
-    case VERIFY_CODES_FOR_PLAYER4 = 'VerifyCodesForPlayer4';
-    case VERIFY_CODES_FOR_PLAYER5 = 'VerifyCodesForPlayer5';
-    case VERIFY_CODES_FOR_PLAYER6 = 'VerifyCodesForPlayer6';
-    case VERIFY_CODES_FOR_PLAYER7 = 'VerifyCodesForPlayer7';
-    case VERIFY_CODES_FOR_PLAYER8 = 'VerifyCodesForPlayer8';
-    case VERIFY_CODES_FOR_PLAYER9 = 'VerifyCodesForPlayer9';
-    case VERIFY_CODES_FOR_PLAYER10 = 'VerifyCodesForPlayer10';
     case VERIFICATION_PROGRESS_FOR_PLAYER1 = 'VerificationProgressForPlayer1';
     case VERIFICATION_PROGRESS_FOR_PLAYER2 = 'VerificationProgressForPlayer2';
     case VERIFICATION_PROGRESS_FOR_PLAYER3 = 'VerificationProgressForPlayer3';
-    case VERIFICATION_PROGRESS_FOR_PLAYER4 = 'VerificationProgressForPlayer4';
-    case VERIFICATION_PROGRESS_FOR_PLAYER5 = 'VerificationProgressForPlayer5';
-    case VERIFICATION_PROGRESS_FOR_PLAYER6 = 'VerificationProgressForPlayer6';
-    case VERIFICATION_PROGRESS_FOR_PLAYER7 = 'VerificationProgressForPlayer7';
-    case VERIFICATION_PROGRESS_FOR_PLAYER8 = 'VerificationProgressForPlayer8';
-    case VERIFICATION_PROGRESS_FOR_PLAYER9 = 'VerificationProgressForPlayer9';
-    case VERIFICATION_PROGRESS_FOR_PLAYER10 = 'VerificationProgressForPlayer10';
     case EVERYONE_VERIFIED = 'EveryoneVerified';
-    case SPECIAL_REPORT_CODE_DOYLE = 'SpecialReportCodeDoyle';
-    case SPECIAL_REPORT_CODE_VEGA = 'SpecialReportCodeVega';
-    case SPECIAL_REPORT_CODE_LENNOX = 'SpecialReportCodeLennox';
 }

src/Game/Service/GameDashboardService.php

@@ -67,10 +67,13 @@ final class GameDashboardService
         $player = new Player();
         $player->setUser($user);
         $player->setSession($session);
+        $player->setScreen(1);
 
         $this->entityManager->persist($session);
         $this->entityManager->persist($player);
 
+        $this->initializePlayerSettings($player);
+
         $this->entityManager->flush();
 
         return $session;
@@ -101,15 +104,17 @@ final class GameDashboardService
         }
 
         $playerCount = count($session->getPlayers());
-        if ($playerCount >= $session->getGame()->getNumberOfPlayers()) {
+        if ($playerCount >= 3) {
             return false; // Session full
         }
 
         $player = new Player();
         $player->setUser($user);
         $player->setSession($session);
+        $player->setScreen($playerCount + 1);
 
         $this->entityManager->persist($player);
+        $this->initializePlayerSettings($player);
 
         $this->entityManager->flush();
 
@@ -165,7 +170,12 @@ final class GameDashboardService
     private function initializePlayerSettings(Player $player): void
     {
         $screen = $player->getScreen();
-        $rightsSettingName = SessionSettingType::tryFrom('RightsForPlayer' . $screen);
+        $rightsSettingName = match ($screen) {
+            1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
+            2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
+            3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
+            default => null,
+        };
 
         if ($rightsSettingName) {
             $setting = new SessionSetting();
@@ -176,18 +186,28 @@ final class GameDashboardService
             $this->entityManager->persist($setting);
         }
 
-        $pwdSettingName = SessionSettingType::tryFrom('PwdForPlayer' . $screen);
+        $pwdSettingName = match ($screen) {
+            1 => SessionSettingType::PWD_FOR_PLAYER1,
+            2 => SessionSettingType::PWD_FOR_PLAYER2,
+            3 => SessionSettingType::PWD_FOR_PLAYER3,
+            default => null,
+        };
 
         if ($pwdSettingName) {
             $setting = new SessionSetting();
             $setting->setSession($player->getSession());
             $setting->setPlayer($player);
             $setting->setName($pwdSettingName);
-            $setting->setValue('var/home/' . $player->getUser()->getUsername());
+            $setting->setValue('home/' . $player->getUser()->getUserIdentifier());
             $this->entityManager->persist($setting);
         }
 
-        $chatTrackingSettingName = SessionSettingType::tryFrom('ChatTrackingForPlayer' . $screen);
+        $chatTrackingSettingName = match ($screen) {
+            1 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER1,
+            2 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER2,
+            3 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER3,
+            default => null,
+        };
 
         if ($chatTrackingSettingName) {
             $setting = new SessionSetting();
@@ -198,12 +218,16 @@ final class GameDashboardService
             $this->entityManager->persist($setting);
         }
 
-        $verifyCodesSettingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $screen);
+        $verifyCodesSettingName = match ($screen) {
+            1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
+            2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
+            3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
+            default => null,
+        };
 
         if ($verifyCodesSettingName) {
             $codes = [];
-            $numPlayers = $player->getSession()->getGame()->getNumberOfPlayers();
-            for ($i = 1; $i <= $numPlayers; $i++) {
+            for ($i = 1; $i <= 3; $i++) {
                 if ($i !== $screen) {
                     $codes[$i] = bin2hex(random_bytes(3)); // 6 characters code
                 }
@@ -217,7 +241,12 @@ final class GameDashboardService
             $this->entityManager->persist($setting);
         }
 
-        $verificationProgressSettingName = SessionSettingType::tryFrom('VerificationProgressForPlayer' . $screen);
+        $verificationProgressSettingName = match ($screen) {
+            1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
+            2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
+            3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
+            default => null,
+        };
 
         if ($verificationProgressSettingName) {
             $setting = new SessionSetting();
@@ -229,34 +258,6 @@ final class GameDashboardService
         }
     }
 
-    public function startSession(Session $session): bool
-    {
-        if ($session->getStatus() !== SessionStatus::CREATED) {
-            return false;
-        }
-
-        $players = $session->getPlayers()->toArray();
-        if (count($players) < $session->getGame()->getNumberOfPlayers()) {
-            return false;
-        }
-
-        // Shuffle players to assign random screens
-        shuffle($players);
-
-        foreach ($players as $index => $player) {
-            $screen = $index + 1;
-            $player->setScreen($screen);
-            $this->initializePlayerSettings($player);
-            $this->entityManager->persist($player);
-        }
-
-        $session->setStatus(SessionStatus::READY);
-        $this->entityManager->persist($session);
-        $this->entityManager->flush();
-
-        return true;
-    }
-
     public function generateInviteCode(Session $session, UserInterface $user, bool $isAdmin): ?string
     {
         // Security check: is user part of this session?

src/Game/Service/GameResponseService.php

@@ -59,7 +59,12 @@ class GameResponseService
 
     private function getRechten(Player $player): array
     {
-        $settingName = SessionSettingType::tryFrom('RightsForPlayer' . $player->getScreen());
+        $settingName = match($player->getScreen()) {
+            1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
+            2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
+            3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
+            default => null,
+        };
 
         if (!$settingName) {
             return [];
@@ -133,15 +138,6 @@ class GameResponseService
 
                 $this->playerService->saveCurrentPwdOfPlayer($player, $newLocation);
                 return ['result' => ['Path: ' . $newLocation]];
-            case 'cat':
-                if(!in_array('cat', $rechten))
-                    return ['result' => ['Unknown command']];
-
-                $pwd = $this->playerService->getCurrentPwdOfPlayer($player);
-
-                $fileContent = $this->getFileContent($player, $pwd.'/'.$messagePart[1]);
-
-                return ['result' => $fileContent];
             case 'pwd':
                 if(!in_array('pwd', $rechten))
                     return ['result' => ['Unknown command']];
@@ -273,7 +269,7 @@ class GameResponseService
         if (isset($messageParts[1]) &&
                 is_numeric($messageParts[1]) &&
                 $messageParts[1] >= 1 &&
-                $messageParts[1] <= $player->getSession()->getGame()->getNumberOfPlayers()) {
+                $messageParts[1] <= 3) {
 
             $toSingle = true;
         }
@@ -313,7 +309,12 @@ class GameResponseService
         $screen = $player->getScreen();
         $session = $player->getSession();
 
-        $verifyCodesSettingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $screen);
+        $verifyCodesSettingName = match ($screen) {
+            1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
+            2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
+            3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
+            default => null,
+        };
 
         if (!$verifyCodesSettingName) {
             return;
@@ -353,7 +354,12 @@ class GameResponseService
         if(in_array('verify', $rights))
             return;
 
-        $trackingSettingName = SessionSettingType::tryFrom('ChatTrackingForPlayer' . $player->getScreen());
+        $trackingSettingName = match ($player->getScreen()) {
+            1 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER1,
+            2 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER2,
+            3 => SessionSettingType::CHAT_TRACKING_FOR_PLAYER3,
+            default => null,
+        };
 
         if (!$trackingSettingName) {
             return;
@@ -383,8 +389,7 @@ class GameResponseService
     {
         $screen = $player->getScreen();
         $requiredTargets = [0]; // Everyone
-        $numPlayers = $player->getSession()->getGame()->getNumberOfPlayers();
-        for ($i = 1; $i <= $numPlayers; $i++) {
+        for ($i = 1; $i <= 3; $i++) {
             if ($i !== $screen) {
                 $requiredTargets[] = $i;
             }
@@ -398,7 +403,12 @@ class GameResponseService
         }
 
         // Grant verify right
-        $rightsSettingName = SessionSettingType::tryFrom('RightsForPlayer' . $screen);
+        $rightsSettingName = match ($screen) {
+            1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
+            2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
+            3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
+            default => null,
+        };
 
         if (!$rightsSettingName) {
             return;
@@ -459,30 +469,6 @@ class GameResponseService
         return $randomString;
     }
 
-    private function generateSpecialCode(int $firstDigit, int $min, int $max): string
-    {
-        $code = $this->generateRandomString($min, $max);
-
-        // Ensure the first numeric digit is the specified $firstDigit
-        $found = false;
-        $codeArray = str_split($code);
-        for ($i = 0; $i < count($codeArray); $i++) {
-            if (ctype_digit($codeArray[$i])) {
-                $codeArray[$i] = (string)$firstDigit;
-                $found = true;
-                break;
-            }
-        }
-        $code = implode('', $codeArray);
-
-        // If no digit was found (highly unlikely given the character set), prepend it
-        if (!$found) {
-            $code = (string)$firstDigit . substr($code, 1);
-        }
-
-        return $code;
-    }
-
     private function handleVerifyMessage(string $message, Player $player) : string
     {
         $messageParts = explode(' ', $message);
@@ -494,7 +480,12 @@ class GameResponseService
         $screen = $player->getScreen();
         $session = $player->getSession();
 
-        $progressSettingName = SessionSettingType::tryFrom('VerificationProgressForPlayer' . $screen);
+        $progressSettingName = match ($screen) {
+            1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
+            2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
+            3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
+            default => null,
+        };
 
         if (!$progressSettingName) {
             return 'Error: Invalid player screen.';
@@ -514,7 +505,12 @@ class GameResponseService
             }
 
             $otherScreen = $otherPlayer->getScreen();
-            $codesSettingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $otherScreen);
+            $codesSettingName = match ($otherScreen) {
+                1 => SessionSettingType::VERIFY_CODES_FOR_PLAYER1,
+                2 => SessionSettingType::VERIFY_CODES_FOR_PLAYER2,
+                3 => SessionSettingType::VERIFY_CODES_FOR_PLAYER3,
+                default => null,
+            };
 
             if (!$codesSettingName) {
                 continue;
@@ -558,7 +554,12 @@ class GameResponseService
     private function grantVerificationRights(Player $player): void
     {
         $screen = $player->getScreen();
-        $rightsSettingName = SessionSettingType::tryFrom('RightsForPlayer' . $screen);
+        $rightsSettingName = match ($screen) {
+            1 => SessionSettingType::RIGHTS_FOR_PLAYER1,
+            2 => SessionSettingType::RIGHTS_FOR_PLAYER2,
+            3 => SessionSettingType::RIGHTS_FOR_PLAYER3,
+            default => null,
+        };
 
         if (!$rightsSettingName) {
             return;
@@ -599,18 +600,18 @@ class GameResponseService
         }
 
         $allVerified = true;
-        foreach ($session->getPlayers() as $otherPlayer) {
-            $otherScreen = $otherPlayer->getScreen();
-            $progressSettingName = SessionSettingType::tryFrom('VerificationProgressForPlayer' . $otherScreen);
+        foreach ([1, 2, 3] as $screen) {
+            $progressSettingName = match ($screen) {
+                1 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER1,
+                2 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER2,
+                3 => SessionSettingType::VERIFICATION_PROGRESS_FOR_PLAYER3,
+                default => null,
+            };
 
-            if (!$progressSettingName) {
-                continue;
-            }
-
-            $progressSetting = $this->sessionSettingRepository->getSetting($session, $progressSettingName, $otherPlayer);
+            $progressSetting = $this->sessionSettingRepository->getSetting($session, $progressSettingName, $player);
             $progress = json_decode($progressSetting?->getValue() ?? '[]', true) ?? [];
 
-            if (count($progress) < $session->getGame()->getNumberOfPlayers() - 1) {
+            if (count($progress) < 2) {
                 $allVerified = false;
                 break;
             }
@@ -692,20 +693,20 @@ class GameResponseService
         $paths[] = '/etc/freak';
         $paths[] = '/etc/host';
 
-        $paths[] = '/var/home';
+        $paths[] = '/home';
 
         $playerNames = ['root', 'Luke', 'Charles', 'William', 'Peter'];
 
         $players = $player->getSession()->getPlayers();
 
-        foreach($players as $p) {
-            $playerNames[] = $p->getUser()->getUsername();
+        foreach($players as $player) {
+            $playerNames[] = $player->getUser()->getUsername();
         }
 
         $playerNames = array_unique($playerNames);
 
         foreach($playerNames as $name) {
-            $paths[] = '/var/home/' . $name;
+            $paths[] = '/home/' . $name;
         }
 
         return $paths;
@@ -771,17 +772,12 @@ class GameResponseService
         $files[] = '/var/rapports/017_123-88.txt';
         $files[] = '/var/rapports/093_138-24.txt';
         $files[] = '/var/rapports/001_145-93.txt';
-        $files[] = '/var/rapports/011_130-62.txt';
         $files[] = '/var/rapports/index.txt';
 
-        if ($player === null) {
-            return $files;
-        }
-
         $players = $player->getSession()->getPlayers();
 
-        foreach($players as $p) {
-            $files[] = '/var/home/' . $p->getUser()->getUsername() . '/verifyCodes.txt';
+        foreach($players as $player) {
+            $files[] = '/var/home/' . $player->getUser()->getUsername() . '/verifyCodes.txt';
         }
 
         return $files;
@@ -795,7 +791,7 @@ class GameResponseService
         }
 
         $allPaths = $this->getAllPossiblePaths($player);
-        $allFiles = $this->getAllPossibleFiles($player);
+        $allFiles = $this->getAllPossibleFiles();
         $deletedFiles = $this->playerService->getDeletedFilesOfSession($player);
 
         $entries = [];
@@ -830,144 +826,4 @@ class GameResponseService
         sort($entries);
         return $entries;
     }
-
-    public function getFileContent(Player $player, string $file) : array
-    {
-        $allPossibleFiles = $this->getAllPossibleFiles($player);
-        if (!in_array($file, $allPossibleFiles)) {
-            return ['File does not exist'];
-        }
-
-        if (str_ends_with($file, '.sh')) {
-            return ['It is not possible to read this file'];
-        }
-
-        if (str_ends_with($file, 'verifyCodes.txt')) {
-            return $this->readVerificationFile($player, $file);
-        }
-
-        $physicalPath = 'assets/game1/filesystem' . $file;
-        if (!file_exists($physicalPath)) {
-            return ['File does not exist'];
-        }
-
-        $content = file($physicalPath);
-        if ($content === false) {
-            return ['Error reading file'];
-        }
-
-        $specialFiles = [
-            '/var/rapports/083_25-39.txt' => [
-                'setting' => SessionSettingType::SPECIAL_REPORT_CODE_DOYLE,
-                'digit' => 1
-            ],
-            '/var/rapports/019_31-11.txt' => [
-                'setting' => SessionSettingType::SPECIAL_REPORT_CODE_VEGA,
-                'digit' => 2
-            ],
-            '/var/rapports/011_130-62.txt' => [
-                'setting' => SessionSettingType::SPECIAL_REPORT_CODE_LENNOX,
-                'digit' => 3
-            ],
-        ];
-
-        if (isset($specialFiles[$file])) {
-            $everyoneVerifiedSetting = $this->sessionSettingRepository->getSetting($player->getSession(), SessionSettingType::EVERYONE_VERIFIED);
-            if ($everyoneVerifiedSetting && $everyoneVerifiedSetting->getValue() === 'true') {
-                $settingInfo = $specialFiles[$file];
-                $codeSetting = $this->sessionSettingRepository->getSetting($player->getSession(), $settingInfo['setting']);
-
-                if (!$codeSetting) {
-                    $codeSetting = new SessionSetting();
-                    $codeSetting->setSession($player->getSession());
-                    $codeSetting->setName($settingInfo['setting']);
-                    $codeSetting->setValue($this->generateSpecialCode($settingInfo['digit'], 75, 100));
-
-                    $this->entityManager->persist($codeSetting);
-                    $this->entityManager->flush();
-                }
-
-                $specialCode = $codeSetting->getValue();
-
-                $newContent = [];
-                foreach ($content as $line) {
-                    $newContent[] = $line;
-                    if (str_starts_with(trim($line), 'Date:')) {
-                        $newContent[] = $specialCode . "\n";
-                    }
-                }
-                $content = $newContent;
-            }
-        }
-
-        return $content;
-    }
-
-    private function readVerificationFile(Player $player, string $file)
-    {
-        $parts = explode('/', $file);
-        $ownerUsername = $parts[3] ?? null;
-
-        $ownerPlayer = null;
-        foreach ($player->getSession()->getPlayers() as $p) {
-            if ($p->getUser()->getUsername() === $ownerUsername) {
-                $ownerPlayer = $p;
-                break;
-            }
-        }
-
-        if (!$ownerPlayer) {
-            return 'File does not exist';
-        }
-
-        $screen = $ownerPlayer->getScreen();
-        $settingName = SessionSettingType::tryFrom('VerifyCodesForPlayer' . $screen);
-
-        if (!$settingName) {
-            return 'Error: Invalid player screen.';
-        }
-
-        $setting = $this->sessionSettingRepository->getSetting($player->getSession(), $settingName, $ownerPlayer);
-        if (!$setting) {
-            $setting = new SessionSetting();
-            $setting->setSession($player->getSession());
-            $setting->setPlayer($ownerPlayer);
-            $setting->setName($settingName);
-        }
-
-        $codes = json_decode($setting->getValue() ?? '[]', true) ?? [];
-
-        $playerNames = ['Luke', 'Charles', 'William', 'Peter'];
-        foreach ($player->getSession()->getPlayers() as $p) {
-            $playerNames[] = $p->getUser()->getUsername();
-        }
-        $playerNames = array_unique($playerNames);
-        sort($playerNames);
-
-        $content = [];
-
-        $content[] = "Verification codes:";
-        $content[] = "";
-
-        foreach ($playerNames as $name) {
-            $key = null;
-            foreach ($player->getSession()->getPlayers() as $p) {
-                if ($p->getUser()->getUsername() === $name) {
-                    $key = (string)$p->getScreen();
-                    break;
-                }
-            }
-            if ($key === null) {
-                $key = $name;
-            }
-
-            if (!isset($codes[$key])) {
-                $codes[$key] = bin2hex(random_bytes(3));
-            }
-
-            $content[] = $name . ": " . $codes[$key] . "\n";
-        }
-
-        return $content;
-    }
 }

src/Game/Service/PlayerService.php

@@ -40,7 +40,12 @@ class PlayerService
     }
 
     public function getCurrentPwdOfPlayer(Player $player) : ?string {
-        $settingName = SessionSettingType::tryFrom('PwdForPlayer' . $player->getScreen());
+        $settingName = match($player->getScreen()) {
+            1 => SessionSettingType::PWD_FOR_PLAYER1,
+            2 => SessionSettingType::PWD_FOR_PLAYER2,
+            3 => SessionSettingType::PWD_FOR_PLAYER3,
+            default => null,
+        };
 
         if (!$settingName) {
             return null;
@@ -52,7 +57,12 @@ class PlayerService
 
     public function saveCurrentPwdOfPlayer(Player $player, string $newLocation)
     {
-        $settingName = SessionSettingType::tryFrom('PwdForPlayer' . $player->getScreen());
+        $settingName = match($player->getScreen()) {
+            1 => SessionSettingType::PWD_FOR_PLAYER1,
+            2 => SessionSettingType::PWD_FOR_PLAYER2,
+            3 => SessionSettingType::PWD_FOR_PLAYER3,
+            default => null,
+        };
 
         if (!$settingName) {
             return;

templates/game/dashboard.html.twig

@@ -69,20 +69,12 @@
                         </td>
                         <td>
                             <a href="{{ path('game', {session: session.id}) }}">Enter Game</a>
-                            {% if session.status.value == 'created' %}
-                                {% if session.players|length >= session.game.numberOfPlayers %}
-                                    <form method="post" style="display:inline;">
-                                        <input type="hidden" name="session_id" value="{{ session.id }}">
-                                        <button type="submit" name="start_session">Start Session</button>
-                                    </form>
-                                {% endif %}
-                                {% if session.timer == 0 %}
+                            {% if session.status.value == 'created' and session.timer == 0 %}
                                 <form method="post" style="display:inline;">
                                     <input type="hidden" name="session_id" value="{{ session.id }}">
                                     <button type="submit" name="leave_session" onclick="return confirm('Are you sure you want to leave this session?')">Leave Session</button>
                                 </form>
                             {% endif %}
-                            {% endif %}
                         </td>
                     </tr>
                 {% endfor %}

tests/Game/GameDashboardServiceTest.php

@@ -36,7 +36,7 @@ class GameDashboardServiceTest extends TestCase
         );
     }
 
-    public function testCreateSessionDoesNotInitializeSettings(): void
+    public function testCreateSessionInitializesRightsAndPwd(): void
     {
         $game = new Game();
         $game->setStatus(GameStatus::OPEN);
@@ -44,23 +44,20 @@ class GameDashboardServiceTest extends TestCase
         $user = new User();
         $user->setUsername('testuser');
 
-        $this->entityManager->expects($this->exactly(2))
+        $this->entityManager->expects($this->exactly(7))
             ->method('persist');
-            // 1. Session, 2. Player
+            // 1. Session, 2. Player, 3. SessionSetting (rights), 4. SessionSetting (pwd), 5. SessionSetting (chat tracking), 6. SessionSetting (verify codes), 7. SessionSetting (verification progress)
 
         $session = $this->service->createSession($game, $user, false);
 
         $this->assertInstanceOf(Session::class, $session);
     }
 
-    public function testJoinSessionDoesNotInitializeSettings(): void
+    public function testJoinSessionInitializesRightsAndPwd(): void
     {
         $user = new User();
         $user->setUsername('testuser');
-        $game = new Game();
-        $game->setNumberOfPlayers(3);
         $session = new Session();
-        $session->setGame($game);
 
         $setting = new SessionSetting();
         $setting->setSession($session);
@@ -74,93 +71,15 @@ class GameDashboardServiceTest extends TestCase
         $repo->method('findOneBy')
             ->willReturn($setting);
 
-        $this->entityManager->expects($this->exactly(1))
+        $this->entityManager->expects($this->exactly(6))
             ->method('persist');
-            // 1. Player
+            // 1. Player, 2. SessionSetting (rights), 3. SessionSetting (pwd), 4. SessionSetting (chat tracking), 5. SessionSetting (verify codes), 6. SessionSetting (verification progress)
 
         $result = $this->service->joinSession('abc-123', $user);
 
         $this->assertTrue($result);
     }
 
-    public function testStartSessionAssignsScreensAndInitializesSettings(): void
-    {
-        $game = new Game();
-        $game->setNumberOfPlayers(2);
-        $session = new Session();
-        $session->setGame($game);
-        $session->setStatus(\App\Game\Enum\SessionStatus::CREATED);
-
-        $user1 = new User();
-        $user1->setUsername('user1');
-        $player1 = new Player();
-        $player1->setUser($user1);
-        $session->addPlayer($player1);
-
-        $user2 = new User();
-        $user2->setUsername('user2');
-        $player2 = new Player();
-        $player2->setUser($user2);
-        $session->addPlayer($player2);
-
-        // For each player (2):
-        // Player (persist)
-        // SessionSetting (rights)
-        // SessionSetting (pwd)
-        // SessionSetting (chat tracking)
-        // SessionSetting (verify codes)
-        // SessionSetting (verification progress)
-        // Total = 2 * 6 = 12
-        // PLUS Session (persist)
-        // Total = 13
-
-        $this->entityManager->expects($this->exactly(13))
-            ->method('persist');
-
-        $result = $this->service->startSession($session);
-
-        $this->assertTrue($result);
-        $this->assertEquals(\App\Game\Enum\SessionStatus::READY, $session->getStatus());
-        $this->assertNotNull($player1->getScreen());
-        $this->assertNotNull($player2->getScreen());
-        $this->assertNotEquals($player1->getScreen(), $player2->getScreen());
-    }
-
-    public function testStartSessionWithFourPlayers(): void
-    {
-        $game = new Game();
-        $game->setNumberOfPlayers(4);
-        $session = new Session();
-        $session->setGame($game);
-        $session->setStatus(\App\Game\Enum\SessionStatus::CREATED);
-
-        for ($i = 1; $i <= 4; $i++) {
-            $user = new User();
-            $user->setUsername('user' . $i);
-            $player = new Player();
-            $player->setUser($user);
-            $session->addPlayer($player);
-        }
-
-        // For each player (4):
-        // Player (persist) + 5 Settings = 6 persists
-        // Total = 4 * 6 = 24
-        // PLUS Session (persist)
-        // Total = 25
-
-        $this->entityManager->expects($this->exactly(25))
-            ->method('persist');
-
-        $result = $this->service->startSession($session);
-
-        $this->assertTrue($result);
-        foreach ($session->getPlayers() as $player) {
-            $this->assertNotNull($player->getScreen());
-            $this->assertGreaterThanOrEqual(1, $player->getScreen());
-            $this->assertLessThanOrEqual(4, $player->getScreen());
-        }
-    }
-
     public function testLeaveSession(): void
     {
         $user = new User();