Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-03 07:04:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: Installer refactoring to inject all dependencies at build time.

Browse Source 
Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2022-06-19 11:39:59 +02:00
parent f134a53d55
commit ff745a0cd5
26 changed files with 373 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
app/modules/web/Controllers/Install/InstallController.php
View File

@@ -27,9 +27,8 @@ namespace SP\Modules\Web\Controllers\Install;
use Exception;
use SP\Core\Application;
use SP\Domain\Install\In\InstallData;
use SP\Domain\Install\In\InstallDataFactory;
use SP\Domain\Install\InstallerServiceInterface;
use SP\Domain\Install\Services\InstallerService;
use SP\Http\JsonResponse;
use SP\Modules\Web\Controllers\ControllerBase;
use SP\Modules\Web\Controllers\Traits\JsonTrait;
@@ -47,7 +46,7 @@ final class InstallController extends ControllerBase
public function __construct(
Application $application,
WebControllerHelper $webControllerHelper,
InstallerServiceInterface $installer
InstallerServiceInterface $installer,
) {
parent::__construct($application, $webControllerHelper);
@@ -56,14 +55,14 @@ final class InstallController extends ControllerBase
/**
* @return bool
* @throws \JsonException
* @throws \SP\Core\Exceptions\SPException
*/
public function installAction(): bool
{
$installData = $this->getInstallDataFromRequest();
$installData = InstallDataFactory::buildFromRequest($this->request);
try {
$this->installer->run(InstallerService::getDatabaseSetup($installData, $this->configData), $installData);
$this->installer->run($installData);
return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Installation finished'));
} catch (Exception $e) {
@@ -72,23 +71,4 @@ final class InstallController extends ControllerBase
return $this->returnJsonResponseException($e);
}
}
/**
* @return \SP\Domain\Install\In\InstallData
*/
private function getInstallDataFromRequest(): InstallData
{
$installData = new InstallData();
$installData->setSiteLang($this->request->analyzeString('sitelang', 'en_US'));
$installData->setAdminLogin($this->request->analyzeString('adminlogin', 'admin'));
$installData->setAdminPass($this->request->analyzeEncrypted('adminpass'));
$installData->setMasterPassword($this->request->analyzeEncrypted('masterpassword'));
$installData->setDbAdminUser($this->request->analyzeString('dbuser', 'root'));
$installData->setDbAdminPass($this->request->analyzeEncrypted('dbpass'));
$installData->setDbName($this->request->analyzeString('dbname', 'syspass'));
$installData->setDbHost($this->request->analyzeString('dbhost', 'localhost'));
$installData->setHostingMode($this->request->analyzeBool('hostingmode', false));
return $installData;
}
}