Changes:

[friendica.git] / src / Module / BaseApi.php

diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index 95eb8f04249d005eef54a5162b1d4e8f16c51eec..dc75b0dd262fc0da5a3ad206fc80e563a45323f2 100644 (file)
--- a/src/Module/BaseApi.php
+++ b/src/Module/BaseApi.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -424,17 +424,17 @@ class BaseApi extends BaseModule
 
                if (empty($token)) {
                        $this->logger->notice('Empty application token');
-                       DI::mstdnError()->Forbidden();
+                       $this->logAndJsonError(403, $this->errorFactory->Forbidden());
                }
 
                if (!isset($token[$scope])) {
                        $this->logger->warning('The requested scope does not exist', ['scope' => $scope, 'application' => $token]);
-                       DI::mstdnError()->Forbidden();
+                       $this->logAndJsonError(403, $this->errorFactory->Forbidden());
                }
 
                if (empty($token[$scope])) {
                        $this->logger->warning('The requested scope is not allowed', ['scope' => $scope, 'application' => $token]);
-                       DI::mstdnError()->Forbidden();
+                       $this->logAndJsonError(403, $this->errorFactory->Forbidden());
                }
        }
 
@@ -526,7 +526,7 @@ class BaseApi extends BaseModule
         * @return void
         * @throws HTTPException\InternalServerErrorException
         */
-       protected function logErrorAndJsonExit(int $errorno, Error $error)
+       protected function logAndJsonError(int $errorno, Error $error)
        {
                $this->logger->info('API Error', ['no' => $errorno, 'error' => $error->toArray(), 'method' => $this->args->getMethod(), 'command' => $this->args->getQueryString(), 'user-agent' => $this->server['HTTP_USER_AGENT'] ?? '']);
                $this->jsonError(403, $error->toArray());