yisroelbaum/Rabbi_Gerzi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: extract error response helper and slim json response

Browse source 
Replace multiple catch blocks with single catch(Throwable) funneled through errorResponse() matching the CompanyController pattern. Also clean jsonResponse to accept data+status only, instantiating Response internally.
This commit is contained in:
Yisroel Baum 2026-05-17 09:59:32 +03:00
parent 8a9b35abd3
commit 9661452c75
Signed by: yisroelbaum
GPG key ID: 0FA60884F75520A9
1 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

45
backend/app/Controllers/AuthController.php
View file

@ -10,9 +10,11 @@ use App\Exceptions\BadRequestException;
use App\Exceptions\UnauthorizedException; use App\Exceptions\UnauthorizedException;
use App\Middleware\AuthMiddleware; use App\Middleware\AuthMiddleware;
use App\User\User; use App\User\User;
use DomainException;
use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Slim\Psr7\Response; use Slim\Psr7\Response;
use Throwable;
class AuthController class AuthController
{ {
@ -36,24 +38,13 @@ class AuthController
password: $body['password'] ?? null, password: $body['password'] ?? null,
), ),
); );
} catch (BadRequestException $exception) { } catch (Throwable $exception) {
return $this->jsonResponse( return $this->errorResponse($exception);
new Response(400),
['error' => $exception->getMessage()],
400,
);
} catch (UnauthorizedException $exception) {
return $this->jsonResponse(
new Response(401),
['error' => $exception->getMessage()],
401,
);
} }
$session = $this->createSession->execute($user); $session = $this->createSession->execute($user);
$response = $this->jsonResponse( $response = $this->jsonResponse(
new Response(200),
['user' => $this->buildUserPayload($user)], ['user' => $this->buildUserPayload($user)],
200, 200,
); );
@ -98,14 +89,12 @@ class AuthController
if (! $user instanceof User) { if (! $user instanceof User) {
return $this->jsonResponse( return $this->jsonResponse(
new Response(401),
['error' => 'unauthenticated'], ['error' => 'unauthenticated'],
401, 401,
); );
} }
return $this->jsonResponse( return $this->jsonResponse(
new Response(200),
['user' => $this->buildUserPayload($user)], ['user' => $this->buildUserPayload($user)],
200, 200,
); );
@ -120,16 +109,38 @@ class AuthController
} }
private function jsonResponse( private function jsonResponse(
ResponseInterface $response,
array $data, array $data,
int $status, int $status,
): ResponseInterface { ): ResponseInterface {
$response = $response->withStatus($status); $response = new Response($status);
$response->getBody()->write(json_encode($data)); $response->getBody()->write(json_encode($data));
return $response->withHeader('Content-Type', 'application/json'); return $response->withHeader('Content-Type', 'application/json');
} }
private function errorResponse(Throwable $exception): ResponseInterface
{
if ($exception instanceof BadRequestException) {
return $this->jsonResponse(
['error' => $exception->getMessage()],
400,
);
}
if ($exception instanceof UnauthorizedException) {
return $this->jsonResponse(
['error' => $exception->getMessage()],
401,
);
}
if ($exception instanceof DomainException) {
return $this->jsonResponse(
['error' => $exception->getMessage()],
409,
);
}
throw $exception;
}
private function parseBody(ServerRequestInterface $request): array private function parseBody(ServerRequestInterface $request): array
{ {
$contentType = $request->getHeaderLine('Content-Type'); $contentType = $request->getHeaderLine('Content-Type');