summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2018-07-12 14:52:36 +0200
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2018-07-24 14:04:22 +0200
commit96108ab8588aa63a242df4a435d26e4ea3aecfdf (patch)
tree534153e0713ea72a9e28d4c1bbb23e5c721659d0 /apps
parent7849630cef494096df1290f6d3b9d3eeed6ce5e6 (diff)
downloadnextcloud-server-96108ab8588aa63a242df4a435d26e4ea3aecfdf.tar.gz
nextcloud-server-96108ab8588aa63a242df4a435d26e4ea3aecfdf.zip
Add event to load additional scripts in the auth page for public shares
Before the public share authentication page is rendered now an event to load additional scripts is dispatched. Thanks to this any app can load its own scripts that, when run on the browser, adjust as needed the page generated by the server. Note, however, that during the handling of the event apps are only able to add scripts or styles to be loaded; they can not render arbitrary content on the page, or change how the content is rendered by the original template; all those changes have to be done by the scripts at run-time. This implies that the scripts of the apps can use only those parameters, like the token of the share, added to the page when it is generated by the "publicshareauth" template. Due to this, and given that the event is being introduced to be used by Talk to inject the UI needed to request the password for a share, the token of the share is now provided in the generated page, just like done in the public share page. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/lib/Controller/ShareController.php29
1 files changed, 29 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
index bd1331a0908..6ebffed2b58 100644
--- a/apps/files_sharing/lib/Controller/ShareController.php
+++ b/apps/files_sharing/lib/Controller/ShareController.php
@@ -61,6 +61,7 @@ use OCP\Files\NotFoundException;
use OCP\Files\IRootFolder;
use OCP\Share\Exceptions\ShareNotFound;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\EventDispatcher\GenericEvent;
use OCP\Share\IManager as ShareManager;
/**
@@ -143,6 +144,34 @@ class ShareController extends AuthPublicShareController {
$this->shareManager = $shareManager;
}
+ /**
+ * @PublicPage
+ * @NoCSRFRequired
+ *
+ * Show the authentication page
+ * The form has to submit to the authenticate method route
+ */
+ public function showAuthenticate(): TemplateResponse {
+ $templateParameters = ['share' => $this->share];
+
+ $event = new GenericEvent(null, $templateParameters);
+ $this->eventDispatcher->dispatch('OCA\Files_Sharing::loadAdditionalScripts::publicShareAuth', $event);
+
+ return new TemplateResponse('core', 'publicshareauth', $templateParameters, 'guest');
+ }
+
+ /**
+ * The template to show when authentication failed
+ */
+ protected function showAuthFailed(): TemplateResponse {
+ $templateParameters = ['share' => $this->share, 'wrongpw' => true];
+
+ $event = new GenericEvent(null, $templateParameters);
+ $this->eventDispatcher->dispatch('OCA\Files_Sharing::loadAdditionalScripts::publicShareAuth', $event);
+
+ return new TemplateResponse('core', 'publicshareauth', $templateParameters, 'guest');
+ }
+
protected function verifyPassword(string $password): bool {
return $this->shareManager->checkPassword($this->share, $password);
}