Skip to content

Move NotFoundResponse to a proper TemplateResponse #21987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Jul 24, 2020
Merged

Move NotFoundResponse to a proper TemplateResponse #21987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions lib/private/AppFramework/Middleware/AdditionalScriptsMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,15 @@ public function __construct(EventDispatcherInterface $legacyDispatcher, IUserSes
}

public function afterController($controller, $methodName, Response $response): Response {
/*
* There is no need to emit these signals on a public share page
* There is a separate event for that already
*/
if ($controller instanceof PublicShareController) {
return $response;
}

if ($response instanceof TemplateResponse) {
$this->legacyDispatcher->dispatch(TemplateResponse::EVENT_LOAD_ADDITIONAL_SCRIPTS, new GenericEvent());
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());
Expand Down
15 changes: 2 additions & 13 deletions lib/public/AppFramework/Http/NotFoundResponse.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,30 +24,19 @@

namespace OCP\AppFramework\Http;

use OCP\Template;

/**
* A generic 404 response showing an 404 error page as well to the end-user
* @since 8.1.0
*/
class NotFoundResponse extends Response {
class NotFoundResponse extends TemplateResponse {

/**
* @since 8.1.0
*/
public function __construct() {
parent::__construct();
parent::__construct('core', '404', [], 'guest');

$this->setContentSecurityPolicy(new ContentSecurityPolicy());
$this->setStatus(404);
}

/**
* @return string
* @since 8.1.0
*/
public function render() {
$template = new Template('core', '404', 'guest');
return $template->fetchPage();
}
}