From 5ae7fb5a341a7a12ed8eee4aee91afecc0bd72c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D?= <nuxsmin@syspass.org>
Date: Sun, 26 Jun 2022 11:16:24 +0200
Subject: [PATCH] chore: Set action name and code style.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rubén D <nuxsmin@syspass.org>
---
 .../api/Controllers/ControllerBase.php        | 29 ++++---------------
 1 file changed, 6 insertions(+), 23 deletions(-)

diff --git a/app/modules/api/Controllers/ControllerBase.php b/app/modules/api/Controllers/ControllerBase.php
index df454b73..7965b5ea 100644
--- a/app/modules/api/Controllers/ControllerBase.php
+++ b/app/modules/api/Controllers/ControllerBase.php
@@ -27,7 +27,6 @@ namespace SP\Modules\Api\Controllers;
 use Exception;
 use Klein\Klein;
 use League\Fractal\Manager;
-use Psr\Container\ContainerInterface;
 use SP\Core\Acl\Acl;
 use SP\Core\Application;
 use SP\Core\Context\ContextInterface;
@@ -48,7 +47,6 @@ abstract class ControllerBase
 {
     protected const SEARCH_COUNT_ITEMS = 25;
 
-    protected ContainerInterface  $dic;
     protected string              $controllerName;
     protected ContextInterface    $context;
     protected EventDispatcher     $eventDispatcher;
@@ -57,6 +55,7 @@ abstract class ControllerBase
     protected ConfigDataInterface $configData;
     protected Manager             $fractal;
     protected Acl                 $acl;
+    protected string              $actionName;
     private bool                  $isAuthenticated = false;
 
     public function __construct(
@@ -71,26 +70,17 @@ abstract class ControllerBase
         $this->router = $router;
         $this->apiService = $apiService;
         $this->acl = $acl;
+
         $this->fractal = new Manager();
-
         $this->controllerName = $this->getControllerName();
-        // FIXME: provide action name
-//        $this->actionName = $actionName;
-
-        if (method_exists($this, 'initialize')) {
-            $this->initialize();
-        }
+        $this->actionName = $this->context->getTrasientKey('_actionName');
     }
 
     final protected function getControllerName(): string
     {
         $class = static::class;
 
-        return substr(
-            $class,
-            strrpos($class, '\\') + 1,
-            -strlen('Controller')
-        ) ?: '';
+        return substr($class, strrpos($class, '\\') + 1, -strlen('Controller')) ?: '';
     }
 
     /**
@@ -116,12 +106,7 @@ abstract class ControllerBase
                 throw new SPException(__u('Unauthorized access'));
             }
 
-            $this->sendJsonResponse(
-                JsonRpcResponse::getResponse(
-                    $apiResponse,
-                    $this->apiService->getRequestId()
-                )
-            );
+            $this->sendJsonResponse(JsonRpcResponse::getResponse($apiResponse, $this->apiService->getRequestId()));
         } catch (SPException $e) {
             processException($e);
 
@@ -139,8 +124,6 @@ abstract class ControllerBase
 
     final protected function returnResponseException(Exception $e): void
     {
-        $this->sendJsonResponse(
-            JsonRpcResponse::getResponseException($e, $this->apiService->getRequestId())
-        );
+        $this->sendJsonResponse(JsonRpcResponse::getResponseException($e, $this->apiService->getRequestId()));
     }
 }
\ No newline at end of file