Added better exception handling

This commit is contained in:
netkas 2025-01-31 13:15:34 -05:00
parent 268630226e
commit 55137a93f2
3 changed files with 32 additions and 6 deletions

View file

@ -6,6 +6,7 @@
use Socialbox\Enums\Flags\SessionFlags; use Socialbox\Enums\Flags\SessionFlags;
use Socialbox\Enums\StandardError; use Socialbox\Enums\StandardError;
use Socialbox\Exceptions\DatabaseOperationException; use Socialbox\Exceptions\DatabaseOperationException;
use Socialbox\Exceptions\Standard\StandardRpcException;
use Socialbox\Interfaces\SerializableInterface; use Socialbox\Interfaces\SerializableInterface;
use Socialbox\Managers\SessionManager; use Socialbox\Managers\SessionManager;
use Socialbox\Objects\ClientRequest; use Socialbox\Objects\ClientRequest;
@ -21,7 +22,14 @@
*/ */
public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
{ {
$session = $request->getSession(); try
{
$session = $request->getSession();
}
catch (DatabaseOperationException $e)
{
throw new StandardRpcException('Failed to retrieve session', StandardError::INTERNAL_SERVER_ERROR, $e);
}
if(!$session->flagExists(SessionFlags::VER_COMMUNITY_GUIDELINES)) if(!$session->flagExists(SessionFlags::VER_COMMUNITY_GUIDELINES))
{ {
return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Community guidelines has already been accepted'); return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Community guidelines has already been accepted');
@ -34,7 +42,7 @@
} }
catch (DatabaseOperationException $e) catch (DatabaseOperationException $e)
{ {
return $rpcRequest->produceError(StandardError::INTERNAL_SERVER_ERROR, $e); throw new StandardRpcException('Failed to update session flow', StandardError::INTERNAL_SERVER_ERROR, $e);
} }
return $rpcRequest->produceResponse(true); return $rpcRequest->produceResponse(true);

View file

@ -6,6 +6,7 @@
use Socialbox\Enums\Flags\SessionFlags; use Socialbox\Enums\Flags\SessionFlags;
use Socialbox\Enums\StandardError; use Socialbox\Enums\StandardError;
use Socialbox\Exceptions\DatabaseOperationException; use Socialbox\Exceptions\DatabaseOperationException;
use Socialbox\Exceptions\Standard\StandardRpcException;
use Socialbox\Interfaces\SerializableInterface; use Socialbox\Interfaces\SerializableInterface;
use Socialbox\Managers\SessionManager; use Socialbox\Managers\SessionManager;
use Socialbox\Objects\ClientRequest; use Socialbox\Objects\ClientRequest;
@ -20,7 +21,15 @@
*/ */
public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
{ {
$session = $request->getSession(); try
{
$session = $request->getSession();
}
catch (DatabaseOperationException $e)
{
throw new StandardRpcException('Failed to retrieve session', StandardError::INTERNAL_SERVER_ERROR, $e);
}
if(!$session->flagExists(SessionFlags::VER_PRIVACY_POLICY)) if(!$session->flagExists(SessionFlags::VER_PRIVACY_POLICY))
{ {
return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Privacy policy has already been accepted'); return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Privacy policy has already been accepted');
@ -33,7 +42,7 @@
} }
catch (DatabaseOperationException $e) catch (DatabaseOperationException $e)
{ {
return $rpcRequest->produceError(StandardError::INTERNAL_SERVER_ERROR, $e); throw new StandardRpcException('Failed to update session flow', StandardError::INTERNAL_SERVER_ERROR, $e);
} }
return $rpcRequest->produceResponse(true); return $rpcRequest->produceResponse(true);

View file

@ -6,6 +6,7 @@
use Socialbox\Enums\Flags\SessionFlags; use Socialbox\Enums\Flags\SessionFlags;
use Socialbox\Enums\StandardError; use Socialbox\Enums\StandardError;
use Socialbox\Exceptions\DatabaseOperationException; use Socialbox\Exceptions\DatabaseOperationException;
use Socialbox\Exceptions\Standard\StandardRpcException;
use Socialbox\Interfaces\SerializableInterface; use Socialbox\Interfaces\SerializableInterface;
use Socialbox\Managers\SessionManager; use Socialbox\Managers\SessionManager;
use Socialbox\Objects\ClientRequest; use Socialbox\Objects\ClientRequest;
@ -20,7 +21,15 @@
*/ */
public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface public static function execute(ClientRequest $request, RpcRequest $rpcRequest): ?SerializableInterface
{ {
$session = $request->getSession(); try
{
$session = $request->getSession();
}
catch (DatabaseOperationException $e)
{
throw new StandardRpcException('Failed to retrieve session', StandardError::INTERNAL_SERVER_ERROR, $e);
}
if(!$session->flagExists(SessionFlags::VER_TERMS_OF_SERVICE)) if(!$session->flagExists(SessionFlags::VER_TERMS_OF_SERVICE))
{ {
return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Terms of service has already been accepted'); return $rpcRequest->produceError(StandardError::FORBIDDEN, 'Terms of service has already been accepted');
@ -33,7 +42,7 @@
} }
catch (DatabaseOperationException $e) catch (DatabaseOperationException $e)
{ {
return $rpcRequest->produceError(StandardError::INTERNAL_SERVER_ERROR, $e); throw new StandardRpcException('Failed to update session flow', StandardError::INTERNAL_SERVER_ERROR, $e);
} }
return $rpcRequest->produceResponse(true); return $rpcRequest->produceResponse(true);