Merge pull request 'set-correct-screens-for-players' (#9) from set-correct-screens-for-players into main

Reviewed-on: #9

.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'

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

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/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,43 +54,9 @@ 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());

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">

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