From f7ca2f8583b633246d7f5dcbe3d32f1f91a082c3 Mon Sep 17 00:00:00 2001 From: Flo Date: Sat, 24 Aug 2024 21:10:39 +0000 Subject: [PATCH] analyzebodymiddleware --- .../src/Handler/ConfirmRegistrationHandler.php | 6 ++---- .../Authentication/src/Handler/LoginUserHandler.php | 6 ++---- .../Authentication/src/Handler/RegisterUserHandler.php | 6 ++---- .../External/User/src/Handler/ChangePasswordHandler.php | 7 ++----- .../External/User/src/Handler/ChangeUsernameHandler.php | 5 +---- .../External/User/src/Handler/CreateUserHandler.php | 6 ++---- 6 files changed, 11 insertions(+), 25 deletions(-) diff --git a/src/ApiDomain/External/Authentication/src/Handler/ConfirmRegistrationHandler.php b/src/ApiDomain/External/Authentication/src/Handler/ConfirmRegistrationHandler.php index 35d9e31..9520d11 100644 --- a/src/ApiDomain/External/Authentication/src/Handler/ConfirmRegistrationHandler.php +++ b/src/ApiDomain/External/Authentication/src/Handler/ConfirmRegistrationHandler.php @@ -7,6 +7,7 @@ namespace Bee\API\External\Authentication\Handler; use Bee\API\External\User\Formatter\UserFormatter; use Bee\Handling\Registration\Handler\Command\ConfirmRegistration\ConfirmRegistrationCommandBuilder; use Bee\Handling\Registration\Handler\Command\ConfirmRegistration\ConfirmRegistrationCommandHandler; +use Bee\Infrastructure\Request\Middleware\AnalyzeBodyMiddleware; use Bee\Infrastructure\Session\Middleware\SessionMiddleware; use Laminas\Diactoros\Response\JsonResponse; use Psr\Http\Message\ResponseInterface; @@ -25,10 +26,7 @@ class ConfirmRegistrationHandler implements RequestHandlerInterface public function handle(ServerRequestInterface $request): ResponseInterface { - $data = json_decode( - $request->getBody()->getContents(), - true - ); + $data = $request->getAttribute(AnalyzeBodyMiddleware::JSON_DATA); $query = $this->builder->build( Uuid::fromString($data['id']), diff --git a/src/ApiDomain/External/Authentication/src/Handler/LoginUserHandler.php b/src/ApiDomain/External/Authentication/src/Handler/LoginUserHandler.php index 3f1728e..0d60330 100644 --- a/src/ApiDomain/External/Authentication/src/Handler/LoginUserHandler.php +++ b/src/ApiDomain/External/Authentication/src/Handler/LoginUserHandler.php @@ -6,6 +6,7 @@ namespace Bee\API\External\Authentication\Handler; use Bee\Handling\UserSession\Handler\Command\LoginUser\LoginUserCommandBuilder; use Bee\Handling\UserSession\Handler\Command\LoginUser\LoginUserCommandHandler; +use Bee\Infrastructure\Request\Middleware\AnalyzeBodyMiddleware; use Bee\Infrastructure\Session\Middleware\SessionMiddleware; use Laminas\Diactoros\Response\JsonResponse; use Psr\Http\Message\ResponseInterface; @@ -23,10 +24,7 @@ class LoginUserHandler implements RequestHandlerInterface public function handle(ServerRequestInterface $request): ResponseInterface { $session = $request->getAttribute(SessionMiddleware::SESSION_ATTRIBUTE); - $data = json_decode( - $request->getBody()->getContents(), - true - ); + $data = $request->getAttribute(AnalyzeBodyMiddleware::JSON_DATA); $query = $this->builder->build( $session, diff --git a/src/ApiDomain/External/Authentication/src/Handler/RegisterUserHandler.php b/src/ApiDomain/External/Authentication/src/Handler/RegisterUserHandler.php index 187590c..124c17e 100644 --- a/src/ApiDomain/External/Authentication/src/Handler/RegisterUserHandler.php +++ b/src/ApiDomain/External/Authentication/src/Handler/RegisterUserHandler.php @@ -4,6 +4,7 @@ declare(strict_types=1); namespace Bee\API\External\Authentication\Handler; +use Bee\Infrastructure\Request\Middleware\AnalyzeBodyMiddleware; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Server\RequestHandlerInterface; @@ -24,10 +25,7 @@ class RegisterUserHandler implements RequestHandlerInterface public function handle(ServerRequestInterface $request): ResponseInterface { $host = $request->getAttribute(AnalyzeHeaderMiddleware::HOST_ATTRIBUTE); - $data = json_decode( - $request->getBody()->getContents(), - true - ); + $data = $request->getAttribute(AnalyzeBodyMiddleware::JSON_DATA); $query = $this->builder->build( $data['username'], diff --git a/src/ApiDomain/External/User/src/Handler/ChangePasswordHandler.php b/src/ApiDomain/External/User/src/Handler/ChangePasswordHandler.php index dc928ab..0d83b8f 100644 --- a/src/ApiDomain/External/User/src/Handler/ChangePasswordHandler.php +++ b/src/ApiDomain/External/User/src/Handler/ChangePasswordHandler.php @@ -7,6 +7,7 @@ namespace Bee\API\External\User\Handler; use Bee\Data\Business\Entity\User; use Bee\Handling\User\Handler\Command\ChangePassword\ChangePasswordCommandBuilder; use Bee\Handling\User\Handler\Command\ChangePassword\ChangePasswordCommandHandler; +use Bee\Infrastructure\Request\Middleware\AnalyzeBodyMiddleware; use Bee\Infrastructure\Response\SuccessResponse; use Bee\Infrastructure\Session\Middleware\LoggedInUserMiddleware; use Psr\Http\Message\ResponseInterface; @@ -25,11 +26,7 @@ class ChangePasswordHandler implements RequestHandlerInterface { /** @var User $user */ $user = $request->getAttribute(LoggedInUserMiddleware::USER_KEY); - - $data = json_decode( - $request->getBody()->getContents(), - true - ); + $data = $request->getAttribute(AnalyzeBodyMiddleware::JSON_DATA); $query = $this->builder->build( $user, diff --git a/src/ApiDomain/External/User/src/Handler/ChangeUsernameHandler.php b/src/ApiDomain/External/User/src/Handler/ChangeUsernameHandler.php index 85257e7..afffb0e 100644 --- a/src/ApiDomain/External/User/src/Handler/ChangeUsernameHandler.php +++ b/src/ApiDomain/External/User/src/Handler/ChangeUsernameHandler.php @@ -26,10 +26,7 @@ class ChangeUsernameHandler implements RequestHandlerInterface /** @var User $user */ $user = $request->getAttribute(LoggedInUserMiddleware::USER_KEY); - $data = json_decode( - $request->getBody()->getContents(), - true - ); + $data = $request->getAttribute(AnalyzeBodyMiddleware::JSON_DATA); $query = $this->builder->build( $user, diff --git a/src/ApiDomain/External/User/src/Handler/CreateUserHandler.php b/src/ApiDomain/External/User/src/Handler/CreateUserHandler.php index 727364f..6301366 100644 --- a/src/ApiDomain/External/User/src/Handler/CreateUserHandler.php +++ b/src/ApiDomain/External/User/src/Handler/CreateUserHandler.php @@ -7,6 +7,7 @@ namespace Bee\API\External\User\Handler; use Bee\API\External\User\Formatter\UserFormatter; use Bee\Handling\User\Handler\Command\CreateUser\CreateUserCommandBuilder; use Bee\Handling\User\Handler\Command\CreateUser\CreateUserCommandHandler; +use Bee\Infrastructure\Request\Middleware\AnalyzeBodyMiddleware; use Laminas\Diactoros\Response\JsonResponse; use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; @@ -23,10 +24,7 @@ class CreateUserHandler implements RequestHandlerInterface public function handle(ServerRequestInterface $request): ResponseInterface { - $data = json_decode( - $request->getBody()->getContents(), - true - ); + $data = $request->getAttribute(AnalyzeBodyMiddleware::JSON_DATA); $query = $this->builder->build( $data['username'],