Merge pull request #23012 from nextcloud/enh/template-reponse-renderas

Make BeforeTemplateRenderedEvent aware of the actual response
nextcloud · Sep 28, 2020 · 3cf46e6 · 3cf46e6
2 parents 789e214 + 8ab2422
commit 3cf46e6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php b/apps/user_status/lib/Listener/BeforeTemplateRenderedListener.php
@@ -28,6 +28,7 @@
 use OCA\UserStatus\AppInfo\Application;
 use OCA\UserStatus\Service\JSDataService;
 use OCP\AppFramework\Http\Events\BeforeTemplateRenderedEvent;
+use OCP\AppFramework\Http\TemplateResponse;
 use OCP\EventDispatcher\Event;
 use OCP\EventDispatcher\IEventListener;
 use OCP\IInitialStateService;
@@ -61,7 +62,7 @@ public function handle(Event $event): void {
 			return;
 		}
 
-		if (!$event->isLoggedIn()) {
+		if (!$event->isLoggedIn() || $event->getResponse()->getRenderAs() !== TemplateResponse::RENDER_AS_USER) {
 			return;
 		}
 

diff --git a/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php b/lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php
@@ -71,7 +71,7 @@ public function afterController($controller, $methodName, Response $response): R
 				$isLoggedIn = false;
 			}
 
-			$this->dispatcher->dispatchTyped(new BeforeTemplateRenderedEvent($isLoggedIn));
+			$this->dispatcher->dispatchTyped(new BeforeTemplateRenderedEvent($isLoggedIn, $response));
 		}
 
 		return $response;

diff --git a/lib/public/AppFramework/Http/Events/BeforeTemplateRenderedEvent.php b/lib/public/AppFramework/Http/Events/BeforeTemplateRenderedEvent.php
@@ -27,6 +27,7 @@
 
 namespace OCP\AppFramework\Http\Events;
 
+use OCP\AppFramework\Http\TemplateResponse;
 use OCP\EventDispatcher\Event;
 
 /**
@@ -38,14 +39,17 @@
 class BeforeTemplateRenderedEvent extends Event {
 	/** @var bool */
 	private $loggedIn;
+	/** @var TemplateResponse */
+	private $response;
 
 	/**
 	 * @since 20.0.0
 	 */
-	public function __construct(bool $loggedIn) {
+	public function __construct(bool $loggedIn, TemplateResponse $response) {
 		parent::__construct();
 
 		$this->loggedIn = $loggedIn;
+		$this->response = $response;
 	}
 
 	/**
@@ -54,4 +58,11 @@ public function __construct(bool $loggedIn) {
 	public function isLoggedIn(): bool {
 		return $this->loggedIn;
 	}
+
+	/**
+	 * @since 20.0.0
+	 */
+	public function getResponse(): TemplateResponse {
+		return $this->response;
+	}
 }