1 files changed, 5 insertions, 30 deletions
diff --git a/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php b/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php
index ec52dde0ecd..f3f9b07f2a8 100644
--- a/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php
+++ b/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php
@@ -32,44 +32,19 @@ use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Http\StandaloneTemplateResponse;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\AppFramework\Middleware;
-use OCP\AppFramework\PublicShareController;
-use OCP\EventDispatcher\GenericEvent;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\IUserSession;
-use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 class AdditionalScriptsMiddleware extends Middleware {
-	/** @var EventDispatcherInterface */
-	private $legacyDispatcher;
-	/** @var IUserSession */
-	private $userSession;
-	/** @var IEventDispatcher */
-	private $dispatcher;
-
-	public function __construct(EventDispatcherInterface $legacyDispatcher, IUserSession $userSession, IEventDispatcher $dispatcher) {
-		$this->legacyDispatcher = $legacyDispatcher;
-		$this->userSession = $userSession;
-		$this->dispatcher = $dispatcher;
+	public function __construct(
+		private IUserSession $userSession,
+		private IEventDispatcher $dispatcher,
+	) {
 	}
 
 	public function afterController($controller, $methodName, Response $response): Response {
 		if ($response instanceof TemplateResponse) {
-			if (!$controller instanceof PublicShareController) {
-				/*
-				 * The old event was not dispatched on the public share controller as there was
-				 * OCA\Files_Sharing::loadAdditionalScripts for that. This is kept for compatibility reasons
-				 * only for the old event as this is now also included in BeforeTemplateRenderedEvent
-				 */
-				$this->legacyDispatcher->dispatch(TemplateResponse::EVENT_LOAD_ADDITIONAL_SCRIPTS, new GenericEvent());
-			}
-
-			if (!($response instanceof StandaloneTemplateResponse) && $this->userSession->isLoggedIn()) {
-				$this->legacyDispatcher->dispatch(TemplateResponse::EVENT_LOAD_ADDITIONAL_SCRIPTS_LOGGEDIN, new GenericEvent());
-				$isLoggedIn = true;
-			} else {
-				$isLoggedIn = false;
-			}
-
+			$isLoggedIn = !($response instanceof StandaloneTemplateResponse) && $this->userSession->isLoggedIn();
 			$this->dispatcher->dispatchTyped(new BeforeTemplateRenderedEvent($isLoggedIn, $response));
 		}