Refactor authentication handling by replacing getAuthenticatedOperator with requireAuthenticatedOperator in multiple entity methods

src/FederationServer/FederationServer.php

@@ -122,11 +122,10 @@
          * This method retrieves the currently authenticated operator, if any.
          * If no operator is authenticated, it returns null.
          *
-         * @param bool $requireAuthentication Whether to require authentication. Defaults to true.
          * @return OperatorRecord|null The authenticated operator record or null if not authenticated.
          * @throws RequestException If authentication is provided but is invalid/operator is disabled.
          */
-        public static function getAuthenticatedOperator(bool $requireAuthentication=true): ?OperatorRecord
+        public static function getAuthenticatedOperator(): ?OperatorRecord
         {
             return parent::getAuthenticatedOperator();
         }

src/FederationServer/Methods/Entities/ListEntityAuditLogs.php

@@ -47,8 +47,6 @@
                 $page = 1;
             }
 
-            $results = [];
-
             if($authenticatedOperator === null)
             {
                 // Public audit logs are enabled, filter by public entries

src/FederationServer/Methods/Entities/ListEntityBlacklistRecords.php

@@ -18,7 +18,7 @@
          */
         public static function handleRequest(): void
         {
-            $authenticatedOperator = FederationServer::getAuthenticatedOperator(false);
+            $authenticatedOperator = FederationServer::getAuthenticatedOperator();
             if(!Configuration::getServerConfiguration()->isBlacklistPublic() && $authenticatedOperator === null)
             {
                 throw new RequestException('Unauthorized: You must be authenticated to list blacklist records', 401);

src/FederationServer/Methods/Entities/ListEntityEvidence.php

@@ -17,7 +17,7 @@
          */
         public static function handleRequest(): void
         {
-            $authenticatedOperator = FederationServer::getAuthenticatedOperator(false);
+            $authenticatedOperator = FederationServer::getAuthenticatedOperator();
             $includeConfidential = false;
 
             if(!Configuration::getServerConfiguration()->isEvidencePublic() && $authenticatedOperator === null)
@@ -70,8 +70,7 @@
                 throw new RequestException('Internal Server Error: Unable to retrieve evidence', 500, $e);
             }
 
-            $result = array_map(fn($evidence) => $evidence->toArray(), $evidenceRecords);
+            self::successResponse(array_map(fn($evidence) => $evidence->toArray(), $evidenceRecords));
-            self::successResponse($result);
         }
     }
 

src/FederationServer/Methods/Entities/PushEntity.php

@@ -15,7 +15,7 @@
          */
         public static function handleRequest(): void
         {
-            $authenticatedOperator = FederationServer::getAuthenticatedOperator();
+            $authenticatedOperator = FederationServer::requireAuthenticatedOperator();
             if(!$authenticatedOperator->isClient() && !$authenticatedOperator->canManageOperators())
             {
                 throw new RequestException('Unauthorized: Insufficient permissions to push entities', 403);

src/FederationServer/Methods/Entities/QueryEntity.php

@@ -2,6 +2,7 @@
 
     namespace FederationServer\Methods\Entities;
 
+    use FederationServer\Classes\Configuration;
     use FederationServer\Classes\Managers\EntitiesManager;
     use FederationServer\Classes\RequestHandler;
     use FederationServer\Exceptions\DatabaseOperationException;
@@ -15,6 +16,12 @@
          */
         public static function handleRequest(): void
         {
+            $authenticatedOperator = FederationServer::getAuthenticatedOperator();
+            if(!Configuration::getServerConfiguration()->isEntitiesPublic() && $authenticatedOperator === null)
+            {
+                throw new RequestException('Unauthorized: You must be authenticated to view entity records', 401);
+            }
+
             $id = FederationServer::getParameter('id');
             $domain = FederationServer::getParameter('domain') ?? null;
 
@@ -30,14 +37,14 @@
 
             try
             {
-                $entitiy = EntitiesManager::getEntity($id, $domain);
+                $entity = EntitiesManager::getEntity($id, $domain);
             }
             catch (DatabaseOperationException $e)
             {
                 throw new RequestException('Internal Server Error: Unable to retrieve entity', 500, $e);
             }
 
-            self::successResponse($entitiy->toArray());
+            self::successResponse($entity->toArray());
         }
     }