feat: HTTP login/register and the world/village WS controllers
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
301f718639
commit
a40e7e549f
|
|
@ -0,0 +1,53 @@
|
|||
<?php
|
||||
|
||||
namespace App\Http\Controllers;
|
||||
|
||||
use App\Models\User;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
use Illuminate\Support\Facades\Hash;
|
||||
|
||||
/** Issues the bearer token the WS client sends when it subscribes. Everything else is WS. */
|
||||
class AuthController extends Controller
|
||||
{
|
||||
public function register(Request $request): JsonResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'name' => ['required', 'string', 'max:40'],
|
||||
'email' => ['required', 'email', 'max:255'],
|
||||
'password' => ['required', 'string', 'min:8', 'max:255'],
|
||||
]);
|
||||
if (User::where('email', $data['email'])->exists()) {
|
||||
return $this->refuse('email_taken', 'This email is already registered.');
|
||||
}
|
||||
|
||||
return $this->issue(User::create($data));
|
||||
}
|
||||
|
||||
public function login(Request $request): JsonResponse
|
||||
{
|
||||
$data = $request->validate([
|
||||
'email' => ['required', 'email'],
|
||||
'password' => ['required', 'string'],
|
||||
]);
|
||||
$user = User::where('email', $data['email'])->first();
|
||||
if (! $user || ! Hash::check($data['password'], $user->password)) {
|
||||
return $this->refuse('invalid_credentials', 'Wrong email or password.');
|
||||
}
|
||||
|
||||
return $this->issue($user);
|
||||
}
|
||||
|
||||
private function issue(User $user): JsonResponse
|
||||
{
|
||||
return response()->json([
|
||||
'token' => $user->createToken('game')->plainTextToken,
|
||||
'user' => $user->only('id', 'name', 'email'),
|
||||
]);
|
||||
}
|
||||
|
||||
private function refuse(string $code, string $message): JsonResponse
|
||||
{
|
||||
return response()->json(['code' => $code, 'message' => $message], 422);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,67 @@
|
|||
<?php
|
||||
|
||||
namespace App\Websocket\Controllers;
|
||||
|
||||
use App\Actions\CancelOrder;
|
||||
use App\Actions\QueueBuild;
|
||||
use App\Actions\QueueDemolish;
|
||||
use App\Actions\QueueUpgrade;
|
||||
use App\Actions\SetPriority;
|
||||
use App\Actions\ShowVillage;
|
||||
use App\Models\User;
|
||||
use App\Models\Village;
|
||||
use App\Presenters\VillagePresenter;
|
||||
use App\Websocket\GameController;
|
||||
use Closure;
|
||||
|
||||
/** village.show|build|upgrade|demolish|cancel|staff. Each answers with the fresh village state. */
|
||||
class VillageController extends GameController
|
||||
{
|
||||
public function show()
|
||||
{
|
||||
return $this->village(fn ($user, $id) => app(ShowVillage::class)($user, $id));
|
||||
}
|
||||
|
||||
public function build()
|
||||
{
|
||||
$x = request('x');
|
||||
$y = request('y');
|
||||
|
||||
return $this->village(fn ($user, $id) => app(QueueBuild::class)(
|
||||
$user,
|
||||
$id,
|
||||
(string) request('type'),
|
||||
is_numeric($x) ? (int) $x : null,
|
||||
is_numeric($y) ? (int) $y : null,
|
||||
));
|
||||
}
|
||||
|
||||
public function upgrade()
|
||||
{
|
||||
return $this->village(fn ($user, $id) => app(QueueUpgrade::class)($user, $id, (int) request('building_id')));
|
||||
}
|
||||
|
||||
public function demolish()
|
||||
{
|
||||
return $this->village(fn ($user, $id) => app(QueueDemolish::class)($user, $id, (int) request('building_id')));
|
||||
}
|
||||
|
||||
public function cancel()
|
||||
{
|
||||
return $this->village(fn ($user, $id) => app(CancelOrder::class)($user, $id, (int) request('order_id')));
|
||||
}
|
||||
|
||||
public function staff()
|
||||
{
|
||||
return $this->village(fn ($user, $id) => app(SetPriority::class)($user, $id, (int) request('building_id'), (int) request('priority')));
|
||||
}
|
||||
|
||||
/** @param Closure(User, int): Village $action */
|
||||
private function village(Closure $action)
|
||||
{
|
||||
return $this->play(fn () => VillagePresenter::present(
|
||||
$action(auth()->user(), (int) request('village_id')),
|
||||
now()->toImmutable(),
|
||||
));
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
<?php
|
||||
|
||||
namespace App\Websocket\Controllers;
|
||||
|
||||
use App\Actions\JoinWorld;
|
||||
use App\Actions\ListWorlds;
|
||||
use App\Websocket\GameController;
|
||||
|
||||
/** world.index, world.join */
|
||||
class WorldController extends GameController
|
||||
{
|
||||
public function index()
|
||||
{
|
||||
return $this->play(fn () => app(ListWorlds::class)(auth()->user()));
|
||||
}
|
||||
|
||||
public function join()
|
||||
{
|
||||
return $this->play(fn () => [
|
||||
'village_id' => app(JoinWorld::class)(auth()->user(), (int) request('world_id'))->id,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
<?php
|
||||
|
||||
namespace App\Websocket;
|
||||
|
||||
use App\Game\GameRuleViolation;
|
||||
use BlaxSoftware\LaravelWebSockets\Websocket\Controller;
|
||||
use Closure;
|
||||
|
||||
/**
|
||||
* Base for the game's WS controllers: authed only, and a refused intent answers
|
||||
* `<event>:error` with `{message, code}` so the client can translate the code.
|
||||
* Lives outside Controllers/ so the resolver never maps an event to it.
|
||||
*/
|
||||
abstract class GameController extends Controller
|
||||
{
|
||||
public $need_auth = true;
|
||||
|
||||
protected function play(Closure $intent): mixed
|
||||
{
|
||||
try {
|
||||
return $intent();
|
||||
} catch (GameRuleViolation $e) {
|
||||
return $this->error(['message' => $e->getMessage(), 'code' => $e->reason]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
<?php
|
||||
|
||||
use App\Http\Controllers\AuthController;
|
||||
use Illuminate\Support\Facades\Route;
|
||||
|
||||
Route::middleware('throttle:10,1')->group(function () {
|
||||
Route::post('auth/register', [AuthController::class, 'register']);
|
||||
Route::post('auth/login', [AuthController::class, 'login']);
|
||||
});
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
<?php
|
||||
|
||||
use App\Models\User;
|
||||
|
||||
it('registers a player and returns a bearer token', function () {
|
||||
$response = $this->postJson('/api/auth/register', [
|
||||
'name' => 'Ada', 'email' => 'ada@example.test', 'password' => 'secret-pass',
|
||||
]);
|
||||
|
||||
$response->assertOk()->assertJsonPath('user.name', 'Ada')->assertJsonStructure(['token', 'user' => ['id', 'name', 'email']]);
|
||||
expect(User::where('email', 'ada@example.test')->first()->tokens)->toHaveCount(1);
|
||||
});
|
||||
|
||||
it('refuses a second account with the same email', function () {
|
||||
User::factory()->create(['email' => 'ada@example.test']);
|
||||
|
||||
$this->postJson('/api/auth/register', ['name' => 'Ada', 'email' => 'ada@example.test', 'password' => 'secret-pass'])
|
||||
->assertStatus(422)->assertJsonPath('code', 'email_taken');
|
||||
});
|
||||
|
||||
it('logs in with the right password only', function () {
|
||||
User::factory()->create(['email' => 'ada@example.test', 'password' => 'secret-pass']);
|
||||
|
||||
$this->postJson('/api/auth/login', ['email' => 'ada@example.test', 'password' => 'wrong-pass'])
|
||||
->assertStatus(422)->assertJsonPath('code', 'invalid_credentials');
|
||||
$this->postJson('/api/auth/login', ['email' => 'ada@example.test', 'password' => 'secret-pass'])
|
||||
->assertOk()->assertJsonStructure(['token']);
|
||||
});
|
||||
Loading…
Reference in New Issue