From 433ff46d3bdd906a9901bf811bf20d487940272e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rub=C3=A9n=20D?= Date: Sun, 19 Jun 2022 23:29:57 +0200 Subject: [PATCH] fix: Use existing config instead of new one during install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rubén D --- lib/SP/Domain/Config/Services/ConfigFileService.php | 2 +- lib/SP/Domain/Install/Services/InstallerService.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/SP/Domain/Config/Services/ConfigFileService.php b/lib/SP/Domain/Config/Services/ConfigFileService.php index 26e8e193..52dc469f 100644 --- a/lib/SP/Domain/Config/Services/ConfigFileService.php +++ b/lib/SP/Domain/Config/Services/ConfigFileService.php @@ -102,7 +102,7 @@ class ConfigFileService implements ConfigInterface $configData = new ConfigData(); // Generate a random salt that is used to add more seed to some passwords - $configData->setPasswordSalt(PasswordUtil::generateRandomBytes(30)); + $configData->setPasswordSalt(PasswordUtil::generateRandomBytes()); $this->saveConfig($configData, false); diff --git a/lib/SP/Domain/Install/Services/InstallerService.php b/lib/SP/Domain/Install/Services/InstallerService.php index 3ef77d53..b55b0c91 100644 --- a/lib/SP/Domain/Install/Services/InstallerService.php +++ b/lib/SP/Domain/Install/Services/InstallerService.php @@ -36,7 +36,6 @@ use SP\DataModel\ProfileData; use SP\DataModel\UserData; use SP\DataModel\UserGroupData; use SP\DataModel\UserProfileData; -use SP\Domain\Config\Adapters\ConfigData as ConfigSettings; use SP\Domain\Config\ConfigInterface; use SP\Domain\Config\ConfigServiceInterface; use SP\Domain\Config\In\ConfigDataInterface; @@ -263,8 +262,8 @@ final class InstallerService implements InstallerServiceInterface */ private function setupConfig(): ConfigDataInterface { - $configData = new ConfigSettings(); - $configData->setConfigVersion(VersionUtil::getVersionStringNormalized()) + $configData = $this->config->getConfigData() + ->setConfigVersion(VersionUtil::getVersionStringNormalized()) ->setDatabaseVersion(VersionUtil::getVersionStringNormalized()) ->setUpgradeKey(null) ->setDbHost($this->installData->getDbHost())