BUGFIX: Standalone Core - move AuthProviderFactoryInterface to correct packgage

Neos.ContentRepository.Core/Classes/Factory/AuthProviderFactoryInterface.php

@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\ContentRepository\Core\Factory;
+
+use Neos\ContentRepository\Core\Feature\Security\AuthProviderInterface;
+use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphReadModelInterface;
+use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
+
+/**
+ * @api
+ */
+interface AuthProviderFactoryInterface
+{
+    public function build(ContentRepositoryId $contentRepositoryId, ContentGraphReadModelInterface $contentGraphReadModel): AuthProviderInterface;
+}

Neos.ContentRepository.Core/Classes/Factory/ContentRepositoryFactory.php

@@ -39,7 +39,6 @@
 use Neos\ContentRepository\Core\Subscription\Subscriber\ProjectionSubscriber;
 use Neos\ContentRepository\Core\Subscription\Subscriber\Subscribers;
 use Neos\ContentRepository\Core\Subscription\SubscriptionId;
-use Neos\ContentRepositoryRegistry\Factory\AuthProvider\AuthProviderFactoryInterface;
 use Neos\EventStore\EventStoreInterface;
 use Psr\Clock\ClockInterface;
 use Psr\Log\LoggerInterface;

Neos.ContentRepository.TestSuite/Classes/Fakes/FakeAuthProviderFactory.php

@@ -4,10 +4,10 @@
 
 namespace Neos\ContentRepository\TestSuite\Fakes;
 
+use Neos\ContentRepository\Core\Factory\AuthProviderFactoryInterface;
 use Neos\ContentRepository\Core\Feature\Security\AuthProviderInterface;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphReadModelInterface;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
-use Neos\ContentRepositoryRegistry\Factory\AuthProvider\AuthProviderFactoryInterface;
 
 final class FakeAuthProviderFactory implements AuthProviderFactoryInterface
 {

Neos.ContentRepositoryRegistry/Classes/ContentRepositoryRegistry.php

@@ -6,6 +6,7 @@
 
 use Neos\ContentRepository\Core\ContentRepository;
 use Neos\ContentRepository\Core\Dimension\ContentDimensionSourceInterface;
+use Neos\ContentRepository\Core\Factory\AuthProviderFactoryInterface;
 use Neos\ContentRepository\Core\Factory\CommandHookFactoryInterface;
 use Neos\ContentRepository\Core\Factory\CommandHooksFactory;
 use Neos\ContentRepository\Core\Factory\ContentRepositoryFactory;
@@ -28,13 +29,12 @@
 use Neos\ContentRepository\Core\Subscription\SubscriptionId;
 use Neos\ContentRepositoryRegistry\Exception\ContentRepositoryNotFoundException;
 use Neos\ContentRepositoryRegistry\Exception\InvalidConfigurationException;
-use Neos\ContentRepositoryRegistry\Factory\AuthProvider\AuthProviderFactoryInterface;
+use Neos\ContentRepositoryRegistry\Factory\AuthProvider\DecoratingLegacyAuthProviderFactory;
 use Neos\ContentRepositoryRegistry\Factory\Clock\ClockFactoryInterface;
 use Neos\ContentRepositoryRegistry\Factory\ContentDimensionSource\ContentDimensionSourceFactoryInterface;
 use Neos\ContentRepositoryRegistry\Factory\EventStore\EventStoreFactoryInterface;
 use Neos\ContentRepositoryRegistry\Factory\NodeTypeManager\NodeTypeManagerFactoryInterface;
 use Neos\ContentRepositoryRegistry\Factory\SubscriptionStore\SubscriptionStoreFactoryInterface;
-use Neos\ContentRepositoryRegistry\SubgraphCachingInMemory\ContentSubgraphWithRuntimeCaches;
 use Neos\ContentRepositoryRegistry\SubgraphCachingInMemory\SubgraphCachePool;
 use Neos\EventStore\EventStoreInterface;
 use Neos\Flow\Annotations as Flow;
@@ -46,6 +46,7 @@
 use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 use Symfony\Component\Serializer\Serializer;
+use Neos\ContentRepositoryRegistry\Factory\AuthProvider\AuthProviderFactoryInterface as LegacyAuthProviderFactoryInterface;
 
 /**
  * @api
@@ -364,6 +365,9 @@ private function buildAuthProviderFactory(ContentRepositoryId $contentRepository
     {
         isset($contentRepositorySettings['authProvider']['factoryObjectName']) || throw InvalidConfigurationException::fromMessage('Content repository "%s" does not have authProvider.factoryObjectName configured.', $contentRepositoryId->value);
         $authProviderFactory = $this->objectManager->get($contentRepositorySettings['authProvider']['factoryObjectName']);
+        if ($authProviderFactory instanceof LegacyAuthProviderFactoryInterface) {
+            return new DecoratingLegacyAuthProviderFactory($authProviderFactory);
+        }
         if (!$authProviderFactory instanceof AuthProviderFactoryInterface) {
             throw InvalidConfigurationException::fromMessage('authProvider.factoryObjectName for content repository "%s" is not an instance of %s but %s.', $contentRepositoryId->value, AuthProviderFactoryInterface::class, get_debug_type($authProviderFactory));
         }

Neos.ContentRepositoryRegistry/Classes/Factory/AuthProvider/AuthProviderFactoryInterface.php

@@ -9,7 +9,9 @@
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
 
 /**
- * @api
+ * @deprecated will be removed with Neos 10.
+ * This factory was unfortunately misplaced into the Neos.ContentRepositoryRegistry package while it must instead reside in Neos.ContentRepository.Core
+ * Please use {@see \Neos\ContentRepository\Core\Factory\AuthProviderFactoryInterface} instead!
  */
 interface AuthProviderFactoryInterface
 {

Neos.ContentRepositoryRegistry/Classes/Factory/AuthProvider/DecoratingLegacyAuthProviderFactory.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\ContentRepositoryRegistry\Factory\AuthProvider;
+
+use Neos\ContentRepository\Core\Feature\Security\AuthProviderInterface;
+use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphReadModelInterface;
+use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
+use Neos\ContentRepositoryRegistry\Factory\AuthProvider\AuthProviderFactoryInterface as LegacyAuthProviderFactoryInterface;
+
+/**
+ * @deprecated {@see LegacyAuthProviderFactoryInterface}
+ */
+final readonly class DecoratingLegacyAuthProviderFactory implements \Neos\ContentRepository\Core\Factory\AuthProviderFactoryInterface
+{
+    public function __construct(
+        private LegacyAuthProviderFactoryInterface $legacyAuthProviderFactory
+    ) {
+    }
+
+    public function build(
+        ContentRepositoryId $contentRepositoryId,
+        ContentGraphReadModelInterface $contentGraphReadModel
+    ): AuthProviderInterface {
+        return $this->legacyAuthProviderFactory->build($contentRepositoryId, $contentGraphReadModel);
+    }
+}

Neos.ContentRepositoryRegistry/Classes/Factory/AuthProvider/StaticAuthProviderFactory.php

@@ -2,6 +2,7 @@
 declare(strict_types=1);
 namespace Neos\ContentRepositoryRegistry\Factory\AuthProvider;
 
+use Neos\ContentRepository\Core\Factory\AuthProviderFactoryInterface;
 use Neos\ContentRepository\Core\Feature\Security\AuthProviderInterface;
 use Neos\ContentRepository\Core\Feature\Security\Dto\UserId;
 use Neos\ContentRepository\Core\Feature\Security\StaticAuthProvider;

Neos.Neos/Classes/Security/ContentRepositoryAuthProvider/ContentRepositoryAuthProviderFactory.php

@@ -4,9 +4,9 @@
 
 namespace Neos\Neos\Security\ContentRepositoryAuthProvider;
 
+use Neos\ContentRepository\Core\Factory\AuthProviderFactoryInterface;
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentGraphReadModelInterface;
 use Neos\ContentRepository\Core\SharedModel\ContentRepository\ContentRepositoryId;
-use Neos\ContentRepositoryRegistry\Factory\AuthProvider\AuthProviderFactoryInterface;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Security\Context as SecurityContext;
 use Neos\Neos\Domain\Service\UserService;