Merge pull request #1278 from nextcloud/bugfix/noid/empty-remote

nextcloud · Dec 3, 2020 · 523210e · 523210e
2 parents bea5976 + 4c31101
commit 523210e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/lib/Capabilities.php b/lib/Capabilities.php
@@ -91,6 +91,7 @@ public function getCapabilities() {
 			$collaboraCapabilities = $this->capabilitiesService->getCapabilities();
 			$this->capabilities = [
 				'richdocuments' => [
+					'version' => \OC::$server->getAppManager()->getAppVersion('richdocuments'),
 					'mimetypes' => self::MIMETYPES,
 					'mimetypesNoDefaultOpen' => self::MIMETYPES_OPTIONAL,
 					'collabora' => $collaboraCapabilities,

diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
@@ -202,7 +202,7 @@ public function open($fileId) {
 						'&richdocuments_remote_access=' . $remote;
 
 						$event = new BeforeFederationRedirectEvent(
-							$item, $relative, $remote
+							$item, $relativeFolderPath, $remote
 						);
 						$eventDispatcher = \OC::$server->getEventDispatcher();
 						$eventDispatcher->dispatch(BeforeFederationRedirectEvent::class, $event);

diff --git a/lib/Db/WopiMapper.php b/lib/Db/WopiMapper.php
@@ -82,6 +82,8 @@ public function generateFileToken($fileId, $owner, $editor, $version, $updatable
 			'direct' => $direct,
 			'isRemoteToken' => $isRemoteToken,
 			'templateId' => $templateId,
+			'remoteServer' => '',
+			'remoteServerToken' => '',
 			'share' => $share
 		]);
 

diff --git a/lib/Service/FederationService.php b/lib/Service/FederationService.php
@@ -196,7 +196,7 @@ public function getRemoteRedirectURL(File $item, $direct = null) {
 				} 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() !== '') {