From 999fc20d3449270e8d4a9512be78f4ec469cc383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Thu, 3 Dec 2020 08:08:27 +0100 Subject: Make sure we always have an empty string in the remote server columns MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Db/WopiMapper.php | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib') diff --git a/lib/Db/WopiMapper.php b/lib/Db/WopiMapper.php index d2cd3842..dbd2f67d 100644 --- a/lib/Db/WopiMapper.php +++ b/lib/Db/WopiMapper.php @@ -82,6 +82,8 @@ class WopiMapper extends Mapper { 'direct' => $direct, 'isRemoteToken' => $isRemoteToken, 'templateId' => $templateId, + 'remoteServer' => '', + 'remoteServerToken' => '', 'share' => $share ]); -- cgit v1.2.3 From c062ea397168109a0cbd443be0b3d663d3b05275 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 1 Dec 2020 09:26:57 +0100 Subject: Fix relative path exposed to the redirect event MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Controller/DocumentController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php index 3f2071db..f9100bce 100644 --- a/lib/Controller/DocumentController.php +++ b/lib/Controller/DocumentController.php @@ -202,7 +202,7 @@ class DocumentController extends Controller { '&richdocuments_remote_access=' . $remote; $event = new BeforeFederationRedirectEvent( - $item, $relative, $remote + $item, $relativeFolderPath, $remote ); $eventDispatcher = \OC::$server->getEventDispatcher(); $eventDispatcher->dispatch(BeforeFederationRedirectEvent::class, $event); -- cgit v1.2.3 From e63a68127db78dbc6530664903a95ab0a27e4000 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 1 Dec 2020 09:27:23 +0100 Subject: Avoid issues with missing trailing slash in remote url MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Service/FederationService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/Service/FederationService.php b/lib/Service/FederationService.php index 1d18fdef..2a06ce5a 100644 --- a/lib/Service/FederationService.php +++ b/lib/Service/FederationService.php @@ -196,7 +196,7 @@ class FederationService { } else { $wopi = $this->tokenManager->getRemoteTokenFromDirect($item, $direct->getUid()); } - $url = $remote . 'index.php/apps/richdocuments/remote?shareToken=' . $item->getStorage()->getToken() . + $url = rtrim($remote, '') . '/index.php/apps/richdocuments/remote?shareToken=' . $item->getStorage()->getToken() . '&remoteServer=' . $wopi->getServerHost() . '&remoteServerToken=' . $wopi->getToken(); if ($item->getInternalPath() !== '') { -- cgit v1.2.3 From 4c31101171ed91a30d9e0fc46233ce7c2ec735ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 1 Dec 2020 08:33:14 +0100 Subject: Expose app version through capabilities MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- lib/Capabilities.php | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/Capabilities.php b/lib/Capabilities.php index e8ad527a..3cd1b8c5 100644 --- a/lib/Capabilities.php +++ b/lib/Capabilities.php @@ -91,6 +91,7 @@ class Capabilities implements ICapability { $collaboraCapabilities = $this->capabilitiesService->getCapabilities(); $this->capabilities = [ 'richdocuments' => [ + 'version' => \OC::$server->getAppManager()->getAppVersion('richdocuments'), 'mimetypes' => self::MIMETYPES, 'mimetypesNoDefaultOpen' => self::MIMETYPES_OPTIONAL, 'collabora' => $collaboraCapabilities, -- cgit v1.2.3