Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/richdocuments.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2018-11-22 19:55:55 +0300
committerRoeland Jago Douma <roeland@famdouma.nl>2018-12-20 09:38:45 +0300
commit56bd27d5c51e7b1b614b87af6a4bb77b1eb8613d (patch)
treecd96c30c58c75a8dced757a44ae20a1d7e2155d6 /lib
parentae2d802a0fba50dcaf85ea8466d02b79f0dd4aa6 (diff)
Set userId so anonymous collabora calls also work
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'lib')
-rw-r--r--lib/Controller/WopiController.php3
-rw-r--r--lib/TemplateManager.php4
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/Controller/WopiController.php b/lib/Controller/WopiController.php
index 8678590d..9ef12282 100644
--- a/lib/Controller/WopiController.php
+++ b/lib/Controller/WopiController.php
@@ -122,6 +122,7 @@ class WopiController extends Controller {
}
if ($wopi->isTemplateToken()) {
+ $this->templateManager->setUserId($wopi->getOwnerUid());
$file = $this->templateManager->get($wopi->getFileid());
} else {
// Login the user to see his mount locations
@@ -192,6 +193,7 @@ class WopiController extends Controller {
// Template is just returned as there is no version logic
if ($wopi->isTemplateToken()) {
+ $this->templateManager->setUserId($wopi->getOwnerUid());
$file = $this->templateManager->get($wopi->getFileid());
$response = new StreamResponse($file->fopen('rb'));
$response->addHeader('Content-Disposition', 'attachment');
@@ -369,6 +371,7 @@ class WopiController extends Controller {
$userFolder = $this->rootFolder->getUserFolder($editor);
if ($wopi->isTemplateToken()) {
+ $this->templateManager->setUserId($wopi->getOwnerUid());
$file = $userFolder->getById($wopi->getTemplateDestination())[0];
} else {
$file = $userFolder->getById($fileId)[0];
diff --git a/lib/TemplateManager.php b/lib/TemplateManager.php
index c152be16..19a7d4cb 100644
--- a/lib/TemplateManager.php
+++ b/lib/TemplateManager.php
@@ -135,6 +135,10 @@ class TemplateManager {
$this->l = $l;
}
+ public function setUserId($userId) {
+ $this->userId = $userId;
+ }
+
/**
* Get template ISimpleFile|Node
*