Merge pull request #4865 from mhsdesign/bugfix/4728-fix-EditorContent…

…StreamZookeeper

BUGFIX: 4728 fix editor content stream zookeeper

Neos.Neos/Classes/Service/EditorContentStreamZookeeper.php

@@ -17,6 +17,7 @@
 use Neos\ContentRepository\Core\Feature\WorkspaceCreation\Command\CreateWorkspace;
 use Neos\ContentRepository\Core\Feature\WorkspaceRebase\Command\RebaseWorkspace;
 use Neos\ContentRepository\Core\Projection\Workspace\Workspace;
+use Neos\ContentRepository\Core\Projection\Workspace\WorkspaceStatus;
 use Neos\ContentRepository\Core\SharedModel\User\UserId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\ContentStreamId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceDescription;
@@ -117,6 +118,11 @@ public function relayEditorAuthentication(Authentication\TokenInterface $token):
         );
         $workspace = $contentRepository->getWorkspaceFinder()->findOneByName($workspaceName);
         if ($workspace !== null) {
+            if ($workspace->status !== WorkspaceStatus::OUTDATED) {
+                // the workspace is either okay or in conflict, which would prevent the editor from logging in
+                return;
+            }
+
             CatchUpTriggerWithSynchronousOption::synchronously(fn() => $contentRepository->handle(
                 RebaseWorkspace::create(
                     $workspace->workspaceName,