diff --git a/src/FederationServer/Methods/Evidence/DeleteEvidence.php b/src/FederationServer/Methods/Evidence/DeleteEvidence.php index 76fb507..1ef08d8 100644 --- a/src/FederationServer/Methods/Evidence/DeleteEvidence.php +++ b/src/FederationServer/Methods/Evidence/DeleteEvidence.php @@ -2,7 +2,6 @@ namespace FederationServer\Methods\Evidence; - use FederationServer\Classes\Logger; use FederationServer\Classes\Managers\EvidenceManager; use FederationServer\Classes\RequestHandler; use FederationServer\Classes\Validate; @@ -17,7 +16,7 @@ */ public static function handleRequest(): void { - $authenticatedOperator = FederationServer::getAuthenticatedOperator(); + $authenticatedOperator = FederationServer::requireAuthenticatedOperator(); if(!$authenticatedOperator->canManageBlacklist()) { throw new RequestException('Forbidden: You do not have permission to delete evidence', 403); @@ -45,7 +44,6 @@ } catch(DatabaseOperationException $e) { - Logger::log()->error('Database error while deleting evidence: ' . $e->getMessage(), $e); throw new RequestException('Internal Server Error: Unable to delete evidence', 500, $e); } diff --git a/src/FederationServer/Methods/Evidence/GetEvidenceRecord.php b/src/FederationServer/Methods/Evidence/GetEvidenceRecord.php index 1ae1e6a..282a1b4 100644 --- a/src/FederationServer/Methods/Evidence/GetEvidenceRecord.php +++ b/src/FederationServer/Methods/Evidence/GetEvidenceRecord.php @@ -3,7 +3,6 @@ namespace FederationServer\Methods\Evidence; use FederationServer\Classes\Configuration; - use FederationServer\Classes\Logger; use FederationServer\Classes\Managers\EvidenceManager; use FederationServer\Classes\RequestHandler; use FederationServer\Classes\Validate; @@ -18,7 +17,7 @@ */ public static function handleRequest(): void { - $authenticatedOperator = FederationServer::getAuthenticatedOperator(false); + $authenticatedOperator = FederationServer::getAuthenticatedOperator(); if(!Configuration::getServerConfiguration()->isEvidencePublic() && $authenticatedOperator === null) { throw new RequestException('Unauthorized: You must be authenticated to access evidence', 401); @@ -50,7 +49,6 @@ } catch(DatabaseOperationException $e) { - Logger::log()->error('Database error while getting evidence: ' . $e->getMessage(), $e); throw new RequestException('Internal Server Error: Unable to get evidence', 500, $e); } } diff --git a/src/FederationServer/Methods/Evidence/ListEvidence.php b/src/FederationServer/Methods/Evidence/ListEvidence.php index 285012f..61bd21c 100644 --- a/src/FederationServer/Methods/Evidence/ListEvidence.php +++ b/src/FederationServer/Methods/Evidence/ListEvidence.php @@ -16,7 +16,7 @@ */ public static function handleRequest(): void { - $authenticatedOperator = FederationServer::getAuthenticatedOperator(false); + $authenticatedOperator = FederationServer::getAuthenticatedOperator(); $includeConfidential = false; if(!Configuration::getServerConfiguration()->isEvidencePublic() && $authenticatedOperator === null) @@ -51,8 +51,7 @@ throw new RequestException('Internal Server Error: Unable to retrieve evidence', 500, $e); } - $result = array_map(fn($evidence) => $evidence->toArray(), $evidenceRecords); - self::successResponse($result); + self::successResponse(array_map(fn($evidence) => $evidence->toArray(), $evidenceRecords)); } } diff --git a/src/FederationServer/Methods/Evidence/SubmitEvidence.php b/src/FederationServer/Methods/Evidence/SubmitEvidence.php index 4f4191b..7c30446 100644 --- a/src/FederationServer/Methods/Evidence/SubmitEvidence.php +++ b/src/FederationServer/Methods/Evidence/SubmitEvidence.php @@ -17,7 +17,7 @@ */ public static function handleRequest(): void { - $authenticatedOperator = FederationServer::getAuthenticatedOperator(); + $authenticatedOperator = FederationServer::requireAuthenticatedOperator(); if(!$authenticatedOperator->canManageBlacklist()) { throw new RequestException('Forbidden: You do not have permission to create evidence', 403); @@ -54,14 +54,12 @@ throw new RequestException('Not Found: Entity does not exist', 404); } - $evidenceUuid = EvidenceManager::addEvidence($entityUuid, $authenticatedOperator->getUuid(), $textContent, $note, $confidential); + self::successResponse(EvidenceManager::addEvidence($entityUuid, $authenticatedOperator->getUuid(), $textContent, $note, $confidential)); } catch (DatabaseOperationException $e) { throw new RequestException('Internal Server Error: Failed to create evidence', 500, $e); } - - self::successResponse($evidenceUuid); } }