action renderer

application/Espo/Core/Utils/Client/ActionRenderer.php

@@ -0,0 +1,61 @@
+<?php
+/************************************************************************
+ * This file is part of EspoCRM.
+ *
+ * EspoCRM - Open Source CRM application.
+ * Copyright (C) 2014-2021 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko
+ * Website: https://www.espocrm.com
+ *
+ * EspoCRM is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * EspoCRM is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with EspoCRM. If not, see http://www.gnu.org/licenses/.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
+ ************************************************************************/
+
+namespace Espo\Core\Utils\Client;
+
+use Espo\Core\Utils\Json;
+use Espo\Core\Utils\ClientManager;
+
+/**
+ * Renders a font-end page that executes a controller action. Utilized by entry points.
+ */
+class ActionRenderer
+{
+    private ClientManager $clientManager;
+
+    public function __construct(ClientManager $clientManager)
+    {
+        $this->clientManager = $clientManager;
+    }
+
+    public function render(string $controller, string $action, ?array $data = null): string
+    {
+        $encodedData = Json::encode($data);
+
+        $script = "
+            require('{$controller}', Controller => {
+                let controller = new Controller(app.baseController.params, app.getControllerInjection());
+                controller.masterView = app.masterView;
+                controller.doAction('{$action}', {$encodedData});
+            });
+        ";
+
+        return $this->clientManager->render($script);
+    }
+}

application/Espo/EntryPoints/ChangePassword.php

@@ -33,10 +33,11 @@ use Espo\Core\Exceptions\BadRequest;
 
 use Espo\Entities\PasswordChangeRequest;
 
+use Espo\Core\Utils\Client\ActionRenderer;
+
 use Espo\Core\EntryPoint\EntryPoint;
 use Espo\Core\EntryPoint\Traits\NoAuth;
 use Espo\Core\Utils\Config;
-use Espo\Core\Utils\ClientManager;
 
 use Espo\Core\Api\Request;
 use Espo\Core\Api\Response;
@@ -49,15 +50,15 @@ class ChangePassword implements EntryPoint
 
     private Config $config;
 
-    private ClientManager $clientManager;
-
     private EntityManager $entityManager;
 
-    public function __construct(Config $config, ClientManager $clientManager, EntityManager $entityManager)
+    private ActionRenderer $actionRenderer;
+
+    public function __construct(Config $config, EntityManager $entityManager, ActionRenderer $actionRenderer)
     {
         $this->config = $config;
-        $this->clientManager = $clientManager;
         $this->entityManager = $entityManager;
+        $this->actionRenderer = $actionRenderer;
     }
 
     public function run(Request $request, Response $response): void
@@ -91,14 +92,8 @@ class ChangePassword implements EntryPoint
             'notFound' => !$passwordChangeRequest,
         ];
 
-        $runScript = "
-            app.getController('PasswordChangeRequest', controller => {
-                controller.doAction('passwordChange', " . json_encode($options) . ");
-            });
-        ";
+        $html = $this->actionRenderer->render('controllers/password-change-request', 'passwordChange', $options);
 
-        $response->writeBody(
-            $this->clientManager->render($runScript)
-        );
+        $response->writeBody($html);
     }
 }