Merge pull request 'Verification done' (#7) from Rechten into main

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=!ChangeThisMercureJWT!
+# 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'

assets/game1.js

@@ -4,7 +4,7 @@ import './styles/game1.css';
 let sequenceFinished = false;
 let stillPlayingSound = true;
 
-function subscribeToMercure(mercurePublicUrl, topic, myScreen) {
+function subscribeToMercure(mercurePublicUrl, topic) {
   try {
     const url = mercurePublicUrl + '?topic=' + encodeURIComponent(topic);
     const es = new EventSource(url);
@@ -16,13 +16,6 @@ function subscribeToMercure(mercurePublicUrl, topic, myScreen) {
 
         // data is [sendTo, message]
         if (Array.isArray(data) && data.length >= 2) {
-          const sendTo = parseInt(data[0]);
-          // Filter: 0 means everyone, otherwise must match myScreen
-          if (sendTo !== 0 && sendTo !== parseInt(myScreen)) {
-            console.log('[Mercure][game1] Message not for this player, skipping.');
-            return;
-          }
-
           const messageContainer = document.getElementById('message-container');
           if (messageContainer) {
             const msgEl = document.createElement('div');
@@ -31,7 +24,6 @@ function subscribeToMercure(mercurePublicUrl, topic, myScreen) {
             msgEl.style.color = '#0F0'; // Green for incoming messages
             msgEl.style.marginBottom = '10px';
             messageContainer.appendChild(msgEl);
-            window.scrollTo(0, document.body.scrollHeight);
             if(stillPlayingSound)
             playSound();
             console.log('[Mercure][game1] sequenceFinished status:', sequenceFinished);
@@ -128,12 +120,11 @@ document.addEventListener('DOMContentLoaded', async () => {
 
   const mercurePublicUrl = cfgEl.dataset.mercurePublicUrl;
   const topic = cfgEl.dataset.topic;
-  const screen = cfgEl.dataset.screen;
   const apiPingUrl = cfgEl.dataset.apiPingUrl;
   const apiEchoUrl = cfgEl.dataset.apiEchoUrl;
 
   if (mercurePublicUrl && topic) {
-    subscribeToMercure(mercurePublicUrl, topic, screen);
+    subscribeToMercure(mercurePublicUrl, topic);
   } else {
     console.warn('[Mercure][game1] Missing data attributes on #mercure-config');
   }
@@ -190,7 +181,6 @@ document.addEventListener('DOMContentLoaded', async () => {
         msgEl.textContent = msg[0];
         msgEl.style.marginBottom = '10px';
         messageContainer.appendChild(msgEl);
-        window.scrollTo(0, document.body.scrollHeight);
 
         playSound();
 
@@ -213,13 +203,6 @@ document.addEventListener('DOMContentLoaded', async () => {
               stillPlayingSound = false;
               sequenceFinished = false;
               const message = inputField.value.trim();
-
-              const msgEl = document.createElement('div');
-              msgEl.className = 'message';
-              msgEl.textContent = message;
-              msgEl.style.marginBottom = '10px';
-              messageContainer.appendChild(msgEl);
-
               if (message && apiEchoUrl) {
                 inputField.value = '';
                 try {
@@ -228,16 +211,6 @@ document.addEventListener('DOMContentLoaded', async () => {
                     body: { message, ts: new Date().toISOString() },
                   });
                   console.log('[API][game1] message sent →', response);
-                  if (response && response.result && Array.isArray(response.result.result)) {
-                    response.result.result.forEach(text => {
-                      const msgEl = document.createElement('div');
-                      msgEl.className = 'message';
-                      msgEl.textContent = text;
-                      msgEl.style.marginBottom = '10px';
-                      messageContainer.appendChild(msgEl);
-                    });
-                    window.scrollTo(0, document.body.scrollHeight);
-                  }
                 } catch (err) {
                   console.error('[API][game1] Failed to send message:', err);
                 }

assets/styles/game1.css

@@ -29,11 +29,8 @@ body {
 
 div#game-timer {
     position: fixed;
-    top: 0;
+    top: 20px;
-    left: 0;
+    left: 20px;
-    width: 100%;
-    padding: 20px;
-    background-color: #000;
     color: #F00;
     font-size: 28px;
     z-index: 100;
@@ -41,7 +38,7 @@ div#game-timer {
 
 div#message-container {
     padding: 20px;
-    padding-top: 80px; /* Space for fixed timer */
+    padding-top: 60px; /* Space for fixed timer */
     display: flex;
     flex-direction: column;
     justify-content: flex-end;
@@ -52,7 +49,6 @@ div#message-container {
 
 div.message {
     color: #C0C0C0;
-    white-space: pre-wrap;
 }
 
 div#input {

compose.yaml

@@ -7,11 +7,11 @@ services:
     environment:
       # Uncomment the following line to disable HTTPS,
       #SERVER_NAME: ':80'
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
+      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
       # Set the URL of your Symfony project (without trailing slash!) as value of the cors_origins directive
       MERCURE_EXTRA_DIRECTIVES: |
-        cors_origins http://localhost:8080
+        cors_origins http://127.0.0.1:8000
     # Comment the following line to disable the development mode
     command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
     healthcheck:

config/packages/mercure.yaml

@@ -3,6 +3,4 @@ mercure:
         default:
             url: '%env(MERCURE_URL)%'
             public_url: '%env(MERCURE_PUBLIC_URL)%'
-            jwt:
+            jwt: '%env(MERCURE_JWT_SECRET)%'
-                secret: '%env(MERCURE_JWT_SECRET)%'
-                publish: ['*']

config/services.yaml

@@ -16,9 +16,5 @@ services:
     App\:
         resource: '../src/'
 
-    App\Game\Service\GameResponseService:
-        arguments:
-            $projectDir: '%kernel.project_dir%'
-
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones

docker/compose.yaml

@@ -63,8 +63,8 @@ services:
     container_name: escapepage-mercure
     environment:
       SERVER_NAME: ":80"
-      MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
+      MERCURE_PUBLISHER_JWT_KEY: ${MERCURE_JWT_SECRET:-!ChangeThisMercureJWT!}
-      MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureJWTSignedBySymfonySecretKey!'
+      MERCURE_SUBSCRIBER_JWT_KEY: ${MERCURE_JWT_SECRET:-!ChangeThisMercureJWT!}
       MERCURE_CORS_ALLOWED_ORIGINS: http://localhost:8080
       MERCURE_PUBLISH_ALLOWED_ORIGINS: http://localhost:8080
       MERCURE_EXTRA_DIRECTIVES: |

src/Game/Controller/GameAdminController.php

@@ -1,63 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Game\Controller;
-
-use App\Game\Entity\Session;
-use App\Game\Repository\SessionRepository;
-use App\Tech\Repository\UserRepository;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Component\Security\Http\Attribute\IsGranted;
-use Symfony\Component\DependencyInjection\Attribute\Autowire;
-
-#[Route('/admin')]
-#[IsGranted('ROLE_ADMIN')]
-final class GameAdminController extends AbstractController
-{
-    public function __construct(
-        #[Autowire('%kernel.project_dir%')]
-        private string $projectDir
-    ) {
-    }
-
-    #[Route('', name: 'game_admin_dashboard', methods: ['GET'])]
-    public function index(
-        UserRepository $userRepository,
-        SessionRepository $sessionRepository
-    ): Response {
-        $players = $userRepository->findByRole('ROLE_PLAYER');
-        $sessions = $sessionRepository->findAll();
-
-        return $this->render('game/admin/index.html.twig', [
-            'players' => $players,
-            'sessions' => $sessions,
-        ]);
-    }
-
-    #[Route('/session/{session}', name: 'game_admin_view_session', methods: ['GET'])]
-    public function viewSession(Session $session): Response
-    {
-        $playersLogs = [];
-        foreach ($session->getPlayers() as $player) {
-            $username = $player->getUser()->getUsername();
-            $logFile = $this->projectDir . '/var/log/sessions/' . $session->getId() . '/' . $username . '.txt';
-
-            $logs = '';
-            if (file_exists($logFile)) {
-                $logs = file_get_contents($logFile);
-            }
-
-            $playersLogs[] = [
-                'username' => $username,
-                'logs' => $logs,
-            ];
-        }
-
-        return $this->render('game/admin/session.html.twig', [
-            'session' => $session,
-            'playersLogs' => $playersLogs,
-        ]);
-    }
-}

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');
@@ -96,18 +85,8 @@ final class GameController extends AbstractController
     #[IsGranted(new Expression("is_granted('ROLE_PLAYER') or is_granted('ROLE_ADMIN')"))]
     #[IsGranted('SESSION_VIEW', subject: 'session')]
     public function index(
-        Session $session,
+        Session $session): Response
-        Security $security,
-        \App\Game\Repository\PlayerRepository $playerRepository
-    ): Response
     {
-        $user = $security->getUser();
+        return $this->render('game/index.html.twig', ['session' => $session]);
-        $player = $playerRepository->findOneBy(['session' => $session, 'user' => $user]);
-        $screen = $player ? $player->getScreen() : 0;
-
-        return $this->render('game/index.html.twig', [
-            'session' => $session,
-            'screen' => $screen,
-        ]);
     }
 }

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,18 @@ 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 <= 3; $i++) {
-            for ($i = 1; $i <= $numPlayers; $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

@@ -21,7 +21,6 @@ class GameResponseService
         private SessionSettingRepository $sessionSettingRepository,
         private HubInterface $hub,
         private EntityManagerInterface $entityManager,
-        private string $projectDir,
     ) {
     }
 
@@ -45,7 +44,7 @@ class GameResponseService
         if(!$player)
             return ['error' => 'You are not in a game.'];
 
-        $this->logSessionActivity($player, 'PLAYER: ' . $message);
+        // TODO: Here i need to add a message handler to save the message in a big log.
 
         $data = [];
 
@@ -55,46 +54,17 @@ class GameResponseService
             $data = $this->checkConsoleCommando($message, $player);
         }
 
-        $responseLog = '';
-        if (isset($data['result']) && is_array($data['result'])) {
-            foreach ($data['result'] as $line) {
-                if (is_array($line)) {
-                    $responseLog .= json_encode($line) . "\n";
-                } elseif (is_string($line) || is_numeric($line)) {
-                    $responseLog .= (string)$line . "\n";
-                }
-            }
-        } elseif (isset($data['error'])) {
-            $responseLog = 'ERROR: ' . $data['error'];
-        }
-
-        if ($responseLog !== '') {
-            $this->logSessionActivity($player, 'SERVER: ' . trim($responseLog));
-        }
-
         return $data;
     }
 
-    private function logSessionActivity(Player $player, string $content): void
-    {
-        $sessionId = $player->getSession()->getId();
-        $username = $player->getUser()->getUsername();
-        $logDir = $this->projectDir . '/var/log/sessions/' . $sessionId;
-
-        if (!is_dir($logDir)) {
-            mkdir($logDir, 0777, true);
-        }
-
-        $logFile = $logDir . '/' . $username . '.txt';
-        $timestamp = date('Y-m-d H:i:s');
-        $logMessage = sprintf("[%s] %s\n", $timestamp, $content);
-
-        file_put_contents($logFile, $logMessage, FILE_APPEND);
-    }
-
     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 [];
@@ -168,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']];
@@ -228,7 +189,6 @@ class GameResponseService
                     $messages[] = '   If you want to send a message specifically to one other agent, use the id of the agent after /chat, like /chat 6 {message}';
                     $messages[] = '   This will send the message only to agent with id 6.';
                     $messages[] = '   USAGE: /chat {message}';
-                    $messages[] = '   USAGE: /chat 6 {message}';
                     $messages[] = '';
                     break;
                 case 'help':
@@ -308,7 +268,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;
         }
@@ -348,7 +308,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;
@@ -388,7 +353,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;
@@ -418,8 +388,7 @@ class GameResponseService
     {
         $screen = $player->getScreen();
         $requiredTargets = [0]; // Everyone
-        $numPlayers = $player->getSession()->getGame()->getNumberOfPlayers();
+        for ($i = 1; $i <= 3; $i++) {
-        for ($i = 1; $i <= $numPlayers; $i++) {
             if ($i !== $screen) {
                 $requiredTargets[] = $i;
             }
@@ -433,7 +402,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;
@@ -494,30 +468,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);
@@ -529,7 +479,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.';
@@ -549,7 +504,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;
@@ -593,7 +553,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;
@@ -619,52 +584,6 @@ class GameResponseService
             $setting->setValue(json_encode($rights));
             $this->entityManager->persist($setting);
             $this->entityManager->flush();
-
-            $this->checkIfAllPlayersVerified($player);
-        }
-    }
-
-    private function checkIfAllPlayersVerified(Player $player): void
-    {
-        $session = $player->getSession();
-        $everyoneVerifiedSetting = $this->sessionSettingRepository->getSetting($session, SessionSettingType::EVERYONE_VERIFIED, $player);
-
-        if ($everyoneVerifiedSetting && $everyoneVerifiedSetting->getValue() === 'true') {
-            return;
-        }
-
-        $allVerified = true;
-        foreach ($session->getPlayers() as $otherPlayer) {
-            $otherScreen = $otherPlayer->getScreen();
-            $progressSettingName = SessionSettingType::tryFrom('VerificationProgressForPlayer' . $otherScreen);
-
-            if (!$progressSettingName) {
-                continue;
-            }
-
-            $progressSetting = $this->sessionSettingRepository->getSetting($session, $progressSettingName, $otherPlayer);
-            $progress = json_decode($progressSetting?->getValue() ?? '[]', true) ?? [];
-
-            if (count($progress) < $session->getGame()->getNumberOfPlayers() - 1) {
-                $allVerified = false;
-                break;
-            }
-        }
-
-        if ($allVerified) {
-            if (!$everyoneVerifiedSetting) {
-                $everyoneVerifiedSetting = new SessionSetting();
-                $everyoneVerifiedSetting->setSession($session);
-                $everyoneVerifiedSetting->setPlayer($player);
-                $everyoneVerifiedSetting->setName(SessionSettingType::EVERYONE_VERIFIED);
-            }
-            $everyoneVerifiedSetting->setValue('true');
-            $this->entityManager->persist($everyoneVerifiedSetting);
-            $this->entityManager->flush();
-
-            $topic = $_ENV['MERCURE_TOPIC_BASE'] . '/game/hub-' . $session->getId();
-            $message = "Mainframe Help Modus: Agents Doyle, Vega and Lennox rapports have been updated with coded messages.";
-            $this->hub->publish(new Update($topic, json_encode([0, $message])));
         }
     }
 
@@ -727,20 +646,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) {
+        foreach($players as $player) {
-            $playerNames[] = $p->getUser()->getUsername();
+            $playerNames[] = $player->getUser()->getUsername();
         }
 
         $playerNames = array_unique($playerNames);
 
         foreach($playerNames as $name) {
-            $paths[] = '/var/home/' . $name;
+            $paths[] = '/home/' . $name;
         }
 
         return $paths;
@@ -806,17 +725,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) {
+        foreach($players as $player) {
-            $files[] = '/var/home/' . $p->getUser()->getUsername() . '/verifyCodes.txt';
+            $files[] = '/var/home/' . $player->getUser()->getUsername() . '/verifyCodes.txt';
         }
 
         return $files;
@@ -830,7 +744,7 @@ class GameResponseService
         }
 
         $allPaths = $this->getAllPossiblePaths($player);
-        $allFiles = $this->getAllPossibleFiles($player);
+        $allFiles = $this->getAllPossibleFiles();
         $deletedFiles = $this->playerService->getDeletedFilesOfSession($player);
 
         $entries = [];
@@ -865,144 +779,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;

src/Tech/Repository/UserRepository.php

@@ -32,16 +32,4 @@ class UserRepository extends ServiceEntityRepository implements PasswordUpgrader
         $this->getEntityManager()->persist($user);
         $this->getEntityManager()->flush();
     }
-
-    /**
-     * @return User[]
-     */
-    public function findByRole(string $role): array
-    {
-        return $this->createQueryBuilder('u')
-            ->andWhere('u.roles LIKE :role')
-            ->setParameter('role', '%"' . $role . '"%')
-            ->getQuery()
-            ->getResult();
-    }
 }

templates/game/admin/index.html.twig

@@ -1,82 +0,0 @@
-{% extends 'base.html.twig' %}
-
-{% block title %}Game Admin Dashboard{% endblock %}
-
-{% block body %}
-    <h1>Game Admin Dashboard</h1>
-
-    <div style="display: flex; gap: 2rem;">
-        <div style="flex: 1;">
-            <h2>All Players ({{ players|length }})</h2>
-            <table style="width: 100%; border-collapse: collapse;">
-                <thead>
-                    <tr style="background-color: #f2f2f2;">
-                        <th>ID</th>
-                        <th>Username</th>
-                        <th>Email</th>
-                        <th>Roles</th>
-                        <th>Verified</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for player in players %}
-                        <tr>
-                            <td>{{ player.id }}</td>
-                            <td>{{ player.username }}</td>
-                            <td>{{ player.email }}</td>
-                            <td>{{ player.roles|join(', ') }}</td>
-                            <td>{{ player.isVerified ? 'Yes' : 'No' }}</td>
-                        </tr>
-                    {% else %}
-                        <tr>
-                            <td colspan="5">No players found.</td>
-                        </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-        </div>
-
-        <div style="flex: 2;">
-            <h2>All Sessions ({{ sessions|length }})</h2>
-            <table style="width: 100%; border-collapse: collapse;">
-                <thead>
-                    <tr style="background-color: #f2f2f2;">
-                        <th>ID</th>
-                        <th>Game</th>
-                        <th>Status</th>
-                        <th>Players Joined</th>
-                        <th>Created At</th>
-                        <th>Actions</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for session in sessions %}
-                        <tr>
-                            <td>{{ session.id }}</td>
-                            <td>{{ session.game.name }}</td>
-                            <td>{{ session.status.value }}</td>
-                            <td>
-                                <ul>
-                                    {% for p in session.players %}
-                                        <li>{{ p.user.username }} (Screen: {{ p.screen ?? 'N/A' }})</li>
-                                    {% else %}
-                                        <li>No players</li>
-                                    {% endfor %}
-                                </ul>
-                                ({{ session.players|length }} / {{ session.game.numberOfPlayers }})
-                            </td>
-                            <td>{{ session.created|date('Y-m-d H:i') }}</td>
-                            <td>
-                                <a href="{{ path('game_admin_view_session', {session: session.id}) }}">View Game Logs</a>
-                            </td>
-                        </tr>
-                    {% else %}
-                        <tr>
-                            <td colspan="6">No sessions found.</td>
-                        </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-        </div>
-    </div>
-{% endblock %}

templates/game/admin/session.html.twig

@@ -1,49 +0,0 @@
-{% extends 'base.html.twig' %}
-
-{% block title %}View Session Logs - {{ session.id }}{% endblock %}
-
-{% block body %}
-    <h1>Session: {{ session.game.name }} (#{{ session.id }})</h1>
-    <p><a href="{{ path('game_admin_dashboard') }}">Back to Dashboard</a></p>
-
-    <div class="tabs">
-        <ul style="display: flex; list-style: none; padding: 0; border-bottom: 1px solid #ccc;">
-            {% for playerLog in playersLogs %}
-                <li style="margin-right: 10px;">
-                    <button
-                        onclick="openTab(event, 'player-{{ loop.index }}')"
-                        class="tablinks {{ loop.first ? 'active' : '' }}"
-                        style="padding: 10px; cursor: pointer; border: 1px solid #ccc; border-bottom: none; background: {{ loop.first ? '#eee' : '#fff' }};"
-                    >
-                        {{ playerLog.username }}
-                    </button>
-                </li>
-            {% endfor %}
-        </ul>
-    </div>
-
-    {% for playerLog in playersLogs %}
-        <div id="player-{{ loop.index }}" class="tabcontent" style="display: {{ loop.first ? 'block' : 'none' }}; border: 1px solid #ccc; border-top: none; padding: 20px;">
-            <h3>Logs for {{ playerLog.username }}</h3>
-            <pre style="background: #f4f4f4; padding: 15px; overflow-x: auto; white-space: pre-wrap; word-wrap: break-word;">{{ playerLog.logs ?: 'No logs found for this player.' }}</pre>
-        </div>
-    {% endfor %}
-
-    <script>
-        function openTab(evt, playerName) {
-            var i, tabcontent, tablinks;
-            tabcontent = document.getElementsByClassName("tabcontent");
-            for (i = 0; i < tabcontent.length; i++) {
-                tabcontent[i].style.display = "none";
-            }
-            tablinks = document.getElementsByClassName("tablinks");
-            for (i = 0; i < tablinks.length; i++) {
-                tablinks[i].className = tablinks[i].className.replace(" active", "");
-                tablinks[i].style.background = "#fff";
-            }
-            document.getElementById(playerName).style.display = "block";
-            evt.currentTarget.className += " active";
-            evt.currentTarget.style.background = "#eee";
-        }
-    </script>
-{% endblock %}

templates/game/dashboard.html.twig

@@ -5,10 +5,6 @@
 {% block body %}
     <h1>Game Dashboard</h1>
 
-    {% if is_granted('ROLE_ADMIN') %}
-        <p><a href="{{ path('game_admin_dashboard') }}">Go to Game Admin Dashboard</a></p>
-    {% endif %}
-
     <h2>Create New Session</h2>
     {% if availableGames is not empty %}
         <form method="post">
@@ -73,20 +69,12 @@
                         </td>
                         <td>
                             <a href="{{ path('game', {session: session.id}) }}">Enter Game</a>
-                            {% if session.status.value == 'created' %}
+                            {% if session.status.value == 'created' and session.timer == 0 %}
-                                {% 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 %}
                                 <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 %}

templates/game/index.html.twig

@@ -18,7 +18,6 @@
              data-topic="{{ (mercure_topic_base ~ '/game/hub-' ~ session.id)|e('html_attr') }}"
              data-api-ping-url="{{ path('game_api_ping')|e('html_attr') }}"
              data-api-echo-url="{{ path('game_api_message')|e('html_attr') }}"
-             data-screen="{{ screen|e('html_attr') }}"
              style="display:none">
         </div>
 

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();

tests/Game/GameResponseServiceChatVerifyCodeTest.php

@@ -3,7 +3,6 @@ declare(strict_types=1);
 
 namespace App\Tests\Game;
 
-use App\Game\Entity\Game;
 use App\Game\Entity\Player;
 use App\Game\Entity\Session;
 use App\Game\Entity\SessionSetting;
@@ -40,8 +39,7 @@ class GameResponseServiceChatVerifyCodeTest extends TestCase
             $this->playerService,
             $this->sessionSettingRepository,
             $this->hub,
-            $this->entityManager,
+            $this->entityManager
-            'H:\escapepage'
         );
 
         $_ENV['MERCURE_TOPIC_BASE'] = 'http://test';
@@ -52,12 +50,8 @@ class GameResponseServiceChatVerifyCodeTest extends TestCase
         $user = new User();
         $user->setUsername('testuser');
 
-        $game = $this->createMock(Game::class);
-        $game->method('getNumberOfPlayers')->willReturn(4);
-
         $session = $this->createMock(Session::class);
         $session->method('getId')->willReturn(123);
-        $session->method('getGame')->willReturn($game);
 
         $player = $this->createMock(Player::class);
         $player->method('getUser')->willReturn($user);

tests/Game/SessionLoggingTest.php

@@ -1,102 +0,0 @@
-<?php
-declare(strict_types=1);
-
-namespace App\Tests\Game;
-
-use App\Game\Entity\Player;
-use App\Game\Entity\Session;
-use App\Game\Entity\SessionSetting;
-use App\Game\Enum\SessionSettingType;
-use App\Game\Repository\SessionSettingRepository;
-use App\Game\Service\GameResponseService;
-use App\Game\Service\PlayerService;
-use App\Tech\Entity\User;
-use Doctrine\ORM\EntityManagerInterface;
-use PHPUnit\Framework\TestCase;
-use Symfony\Bundle\SecurityBundle\Security;
-use Symfony\Component\Mercure\HubInterface;
-
-class SessionLoggingTest extends TestCase
-{
-    private string $tempDir;
-    private $security;
-    private $playerService;
-    private $sessionSettingRepository;
-    private $hub;
-    private $entityManager;
-    private $service;
-
-    protected function setUp(): void
-    {
-        $this->tempDir = sys_get_temp_dir() . '/escapepage_test_' . uniqid();
-        mkdir($this->tempDir, 0777, true);
-
-        $this->security = $this->createMock(Security::class);
-        $this->playerService = $this->createMock(PlayerService::class);
-        $this->sessionSettingRepository = $this->createMock(SessionSettingRepository::class);
-        $this->hub = $this->createMock(HubInterface::class);
-        $this->entityManager = $this->createMock(EntityManagerInterface::class);
-
-        $this->service = new GameResponseService(
-            $this->security,
-            $this->playerService,
-            $this->sessionSettingRepository,
-            $this->hub,
-            $this->entityManager,
-            $this->tempDir
-        );
-    }
-
-    protected function tearDown(): void
-    {
-        $this->removeDir($this->tempDir);
-    }
-
-    private function removeDir(string $dir): void
-    {
-        if (!is_dir($dir)) return;
-        $files = array_diff(scandir($dir), ['.', '..']);
-        foreach ($files as $file) {
-            (is_dir("$dir/$file")) ? $this->removeDir("$dir/$file") : unlink("$dir/$file");
-        }
-        rmdir($dir);
-    }
-
-    public function testLogging(): void
-    {
-        $user = new User();
-        $user->setUsername('player1');
-
-        $session = $this->createMock(Session::class);
-        $session->method('getId')->willReturn(456);
-
-        $player = $this->createMock(Player::class);
-        $player->method('getUser')->willReturn($user);
-        $player->method('getSession')->willReturn($session);
-        $player->method('getScreen')->willReturn(1);
-
-        $this->security->method('getUser')->willReturn($user);
-        $this->playerService->method('GetCurrentlyActiveAsPlayer')->willReturn($player);
-
-        // Mock rights
-        $rightsSetting = new SessionSetting();
-        $rightsSetting->setValue(json_encode(['chat']));
-        $this->sessionSettingRepository->method('getSetting')
-            ->willReturnMap([
-                [$session, SessionSettingType::RIGHTS_FOR_PLAYER1, $player, $rightsSetting],
-            ]);
-
-        // Simulate 'help' command (always returns something)
-        $raw = json_encode(['message' => 'help', 'ts' => '123']);
-        $result = $this->service->getGameResponse($raw);
-
-        $this->assertNotEmpty($result);
-
-        $logFilePath = $this->tempDir . '/var/log/sessions/456/player1.txt';
-        $this->assertFileExists($logFilePath);
-
-        $logContent = file_get_contents($logFilePath);
-        $this->assertStringContainsString('PLAYER: help', $logContent);
-        $this->assertStringContainsString('SERVER:', $logContent);
-    }
-}