feat: mint matchId and turnToken in PostStartMatch

This commit is contained in:
Keith Solomon
2026-07-25 22:52:34 -05:00
parent 3d8c1cfdb2
commit 9314fc5870
2 changed files with 47 additions and 1 deletions
+16 -1
View File
@@ -6,6 +6,7 @@ namespace BattleForge\Http\Handlers;
use BattleForge\Application\ScenarioDraft; use BattleForge\Application\ScenarioDraft;
use BattleForge\Application\ScenarioSerializer; use BattleForge\Application\ScenarioSerializer;
use BattleForge\Application\TurnToken;
use BattleForge\Domain\ScenarioValidator; use BattleForge\Domain\ScenarioValidator;
use BattleForge\Http\CsrfToken; use BattleForge\Http\CsrfToken;
use BattleForge\Http\Request; use BattleForge\Http\Request;
@@ -36,6 +37,20 @@ final class PostStartMatch
return Response::json(400, ['errors' => [$exception->getMessage()]]); return Response::json(400, ['errors' => [$exception->getMessage()]]);
} }
return Response::json(200, ['match' => ScenarioSerializer::matchToArray($match)]); $matchId = bin2hex(random_bytes(8));
$matchArray = ScenarioSerializer::matchToArray($match);
$turnToken = TurnToken::issue(
$secret,
$matchId,
$match->activeTeamId,
$match->round,
count($match->actionLog),
);
return Response::json(200, [
'match' => $matchArray,
'matchId' => $matchId,
'turnToken' => $turnToken,
]);
} }
} }
+31
View File
@@ -38,6 +38,10 @@ final class PostStartMatchTest extends TestCase
self::assertSame('alpha', $body['match']['activeTeamId'] ?? null); self::assertSame('alpha', $body['match']['activeTeamId'] ?? null);
self::assertSame(1, $body['match']['round'] ?? null); self::assertSame(1, $body['match']['round'] ?? null);
self::assertCount(6, $body['match']['units'] ?? []); self::assertCount(6, $body['match']['units'] ?? []);
self::assertIsString($body['matchId'] ?? null);
self::assertMatchesRegularExpression('/^[a-f0-9]{16,}$/', $body['matchId']);
self::assertIsString($body['turnToken'] ?? null);
self::assertMatchesRegularExpression('/^[a-f0-9]{32}$/', $body['turnToken']);
} }
public function testItReturns400OnAnInvalidScenario(): void public function testItReturns400OnAnInvalidScenario(): void
@@ -54,6 +58,33 @@ final class PostStartMatchTest extends TestCase
self::assertSame(400, $response->status); self::assertSame(400, $response->status);
} }
public function testItReturnsATurnTokenValidForTheInitialMatchState(): void
{
[$token, $cookie] = CsrfToken::issue(self::SECRET);
$handler = new PostStartMatch();
$request = $this->buildRequest(
rawBody: json_encode($this->validScenario(), JSON_THROW_ON_ERROR),
csrfHeader: $token,
cookies: ['__csrf' => $cookie],
);
$response = $handler->handle($request, ['id' => 'demo']);
self::assertSame(200, $response->status);
$body = json_decode($response->body, true);
$matchId = $body['matchId'];
$turnToken = $body['turnToken'];
$lastActionIndex = count($body['match']['actionLog'] ?? []);
self::assertTrue(\BattleForge\Application\TurnToken::verify(
self::SECRET,
$matchId,
$body['match']['activeTeamId'],
$body['match']['round'],
$lastActionIndex,
$turnToken,
));
}
/** @param array<string, string> $cookies */ /** @param array<string, string> $cookies */
private function buildRequest(string $rawBody, string $csrfHeader, array $cookies = []): Request private function buildRequest(string $rawBody, string $csrfHeader, array $cookies = []): Request
{ {