New user account type "Channel Relay"

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

diff --git a/src/Module/BaseApi.php b/src/Module/BaseApi.php
index d8bf657329a3fab87c307532ffc155b75257ac52..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
  *
@@ -97,7 +97,7 @@ class BaseApi extends BaseModule
                                case Router::PATCH:
                                case Router::POST:
                                case Router::PUT:
-                                       self::checkAllowedScope(self::SCOPE_WRITE);
+                                       $this->checkAllowedScope(self::SCOPE_WRITE);
 
                                        if (!self::getCurrentUserID()) {
                                                throw new HTTPException\ForbiddenException($this->t('Permission denied.'));
@@ -418,23 +418,23 @@ class BaseApi extends BaseModule
         *
         * @param string $scope the requested scope (read, write, follow, push)
         */
-       public static function checkAllowedScope(string $scope)
+       public function checkAllowedScope(string $scope)
        {
                $token = self::getCurrentApplication();
 
                if (empty($token)) {
-                       Logger::notice('Empty application token');
-                       DI::mstdnError()->Forbidden();
+                       $this->logger->notice('Empty application token');
+                       $this->logAndJsonError(403, $this->errorFactory->Forbidden());
                }
 
                if (!isset($token[$scope])) {
-                       Logger::warning('The requested scope does not exist', ['scope' => $scope, 'application' => $token]);
-                       DI::mstdnError()->Forbidden();
+                       $this->logger->warning('The requested scope does not exist', ['scope' => $scope, 'application' => $token]);
+                       $this->logAndJsonError(403, $this->errorFactory->Forbidden());
                }
 
                if (empty($token[$scope])) {
-                       Logger::warning('The requested scope is not allowed', ['scope' => $scope, 'application' => $token]);
-                       DI::mstdnError()->Forbidden();
+                       $this->logger->warning('The requested scope is not allowed', ['scope' => $scope, 'application' => $token]);
+                       $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());