Made repository aware (incomplete)

Author: glye

src/bundle/Core/DependencyInjection/Configuration/Parser/PasswordHash.php renamed to src/bundle/Core/DependencyInjection/Configuration/Parser/Repository/PasswordHash.php

@@ -6,9 +6,10 @@
  */
 declare(strict_types=1);
 
-namespace Ibexa\Bundle\Core\DependencyInjection\Configuration\Parser;
+namespace Ibexa\Bundle\Core\DependencyInjection\Configuration\Parser\Repository;
 
 use Ibexa\Bundle\Core\DependencyInjection\Configuration\AbstractParser;
+use Ibexa\Bundle\Core\DependencyInjection\Configuration\RepositoryConfigParserInterface;
 use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\ContextualizerInterface;
 use Ibexa\Contracts\Core\Repository\Values\User\User;
 use Symfony\Component\Config\Definition\Builder\NodeBuilder;
@@ -28,7 +29,7 @@
  *              update_type_on_change: false
  * ```
  */
-final class PasswordHash extends AbstractParser
+final class PasswordHash extends AbstractParser implements RepositoryConfigParserInterface
 {
     public function addSemanticConfig(NodeBuilder $nodeBuilder): void
     {

src/bundle/Core/IbexaCoreBundle.php

@@ -98,6 +98,10 @@ public function build(ContainerBuilder $container): void
         $container->addCompilerPass(new TranslationCollectorPass());
         $container->addCompilerPass(new SlugConverterConfigurationPass());
 
+        /** @var \Ibexa\Bundle\Core\DependencyInjection\IbexaCoreExtension $kernel */
+        $kernel = $container->getExtension('ibexa');
+        $kernel->addRepositoryConfigParser(new RepositoryConfigParser\PasswordHash());
+
         $container->registerForAutoconfiguration(VariableProvider::class)->addTag('ezplatform.view.variable_provider');
     }
 
@@ -125,13 +129,13 @@ public function getContainerExtension(): ExtensionInterface
                     new ConfigParser\UrlChecker(),
                     new ConfigParser\TwigVariablesParser(),
                     new ConfigParser\UserContentTypeIdentifier(),
-                    new ConfigParser\PasswordHash(),
                 ],
                 [
                     new RepositoryConfigParser\Storage(),
                     new RepositoryConfigParser\Search(),
                     new RepositoryConfigParser\FieldGroups(),
                     new RepositoryConfigParser\Options(),
+                    new RepositoryConfigParser\PasswordHash(),
                 ]
             );
         }

src/bundle/Core/Resources/config/default_settings.yml

@@ -99,10 +99,6 @@ parameters:
     ibexa.site_access.config.default.users_group_root_subtree_path: '/1/5'
     ibexa.site_access.config.default.api_keys: {}     # Google Maps APIs v3 key (https://developers.google.com/maps/documentation/javascript/get-api-key)
 
-    # Password hash
-    ibexa.site_access.config.default.password_hash.default_type: 7               # Default password hash type, see the constants in Ibexa\Contracts\Core\Repository\Values\User\User
-    ibexa.site_access.config.default.password_hash.update_type_on_change: false  # Whether the password hash type should be changed when the password is changed if it differs from the default hash type
-
     # IO
     ibexa.site_access.config.default.io.metadata_handler: "default"
     ibexa.site_access.config.default.io.binarydata_handler: "default"

src/lib/Repository/User/PasswordHashService.php

@@ -8,9 +8,9 @@
 
 namespace Ibexa\Core\Repository\User;
 
+use Ibexa\Contracts\Core\Container\ApiLoader\RepositoryConfigurationProviderInterface;
 use Ibexa\Contracts\Core\Repository\PasswordHashService as PasswordHashServiceInterface;
 use Ibexa\Contracts\Core\Repository\Values\User\User;
-use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Core\Repository\User\Exception\PasswordHashTypeNotCompiled;
 use Ibexa\Core\Repository\User\Exception\UnsupportedPasswordHashType;
 
@@ -19,11 +19,11 @@
  */
 final class PasswordHashService implements PasswordHashServiceInterface
 {
-    private ConfigResolverInterface $configResolver;
+    private RepositoryConfigurationProviderInterface $repositoryConfigurationProvider;
 
-    public function __construct(ConfigResolverInterface $configResolver)
+    public function __construct(RepositoryConfigurationProviderInterface $repositoryConfigurationProvider)
     {
-        $this->configResolver = $configResolver;
+        $this->repositoryConfigurationProvider = $repositoryConfigurationProvider;
     }
 
     public function getSupportedHashTypes(): array
@@ -38,7 +38,9 @@ public function isHashTypeSupported(int $hashType): bool
 
     public function getDefaultHashType(): int
     {
-        return $this->configResolver->getParameter('password_hash.default_type');
+        $config = $this->repositoryConfigurationProvider->getRepositoryConfig();
+
+        return $config['password_hash']['default_type'];
     }
 
     public function createPasswordHash(
@@ -105,6 +107,8 @@ public function isValidPassword(
 
     public function shouldPasswordHashTypeBeUpdatedOnChange(): bool
     {
-        return $this->configResolver->getParameter('password_hash.update_type_on_change');
+        $config = $this->repositoryConfigurationProvider->getRepositoryConfig();
+
+        return $config['password_hash']['update_type_on_change'];
     }
 }

src/lib/Resources/settings/fieldtype_services.yml

@@ -62,7 +62,7 @@ services:
 
     Ibexa\Core\Repository\User\PasswordHashService:
         arguments:
-            $configResolver: '@ibexa.config.resolver'
+            $repositoryConfigurationProvider: '@Ibexa\Core\Base\Container\ApiLoader\RepositoryConfigurationProvider'
 
     Ibexa\Contracts\Core\Repository\PasswordHashService:
         alias: Ibexa\Core\Repository\User\PasswordHashService

src/lib/Resources/settings/settings.yml

@@ -11,10 +11,6 @@ parameters:
     ibexa.site_access.config.default.io.permissions.files: 0o644
     ibexa.site_access.config.default.io.permissions.directories: 0o755
 
-    # Password hash
-    ibexa.site_access.config.password_hash.default_type: 7               # Password hash type, see the constants in Ibexa\Contracts\Core\Repository\Values\User\User
-    ibexa.site_access.config.password_hash.update_type_on_change: false  # Whether the password hash type should be changed when the password is changed if it differs from the default hash type
-
 services:
     ibexa.api.persistence_handler:
         #To disable cache, switch alias to Ibexa\Contracts\Core\Persistence\Handler

tests/integration/Core/Resources/settings/integration_legacy.yml

@@ -14,9 +14,6 @@ parameters:
 
     ibexa.site_access.config.default.user_content_type_identifier: ['user']
 
-    ibexa.site_access.config.default.password_hash.default_type: 7
-    ibexa.site_access.config.default.password_hash.update_type_on_change: false
-
     ibexa.repositories:
         default:
             storage: ~
@@ -29,6 +26,9 @@ parameters:
             options:
                 default_version_archive_limit: 5
                 remove_archived_versions_on_publish: true
+            password_hash:
+                default_type: 7
+                update_type_on_change: false
 
     ibexa.site_access.config.default.repository: default
     ibexa.site_access.config.default.languages: '%languages%'

tests/lib/Repository/User/PasswordHashServiceTest.php

@@ -10,38 +10,26 @@
 
 use Ibexa\Contracts\Core\Repository\Values\User\User;
 use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
+use Ibexa\Core\Base\Container\ApiLoader\RepositoryConfigurationProvider;
 use Ibexa\Core\Repository\User\Exception\UnsupportedPasswordHashType;
 use Ibexa\Core\Repository\User\PasswordHashService;
-use PHPUnit\Framework\MockObject\MockObject;
-use PHPUnit\Framework\TestCase;
+use Ibexa\Tests\Bundle\Core\ApiLoader\BaseRepositoryConfigurationProviderTestCase;
 
-final class PasswordHashServiceTest extends TestCase
+final class PasswordHashServiceTest extends BaseRepositoryConfigurationProviderTestCase
 {
     private const int NON_EXISTING_PASSWORD_HASH = PHP_INT_MAX;
 
     private PasswordHashService $passwordHashService;
 
     protected function setUp(): void
     {
-        $this->passwordHashService = new PasswordHashService($this->getConfigResolverMock());
-    }
-
-    private function getConfigResolverMock(): ConfigResolverInterface & MockObject
-    {
-        $configResolver = $this
-            ->createMock(ConfigResolverInterface::class);
-
-        $configResolver
-            ->method('getParameter')
-            ->with('password_hash.default_type')
-            ->willReturn(User::PASSWORD_HASH_PHP_DEFAULT);
-
-        $configResolver
-            ->method('getParameter')
-            ->with('password_hash.update_type_on_change')
-            ->willReturn(false);
+        $repositories = [
+            'legacy' => $this->buildNormalizedSingleRepositoryConfig('legacy'),
+        ];
 
-        return $configResolver;
+        $configResolver = $this->createMock(ConfigResolverInterface::class);
+        $repositoryConfigurationProvider = new RepositoryConfigurationProvider($configResolver, $repositories);
+        $this->passwordHashService = new PasswordHashService($repositoryConfigurationProvider);
     }
 
     public function testGetSupportedHashTypes(): void