fixup! fixup! feat(direct-editing): integrate with OCP\DirectEditing API

Author: juliusknorr

lib/Service/DirectEditingViewService.php

@@ -65,7 +65,7 @@ public function primeTemplateSource(int $targetFileId, int $templateFileId, stri
 	}
 
 	public function render(File $file, string $userId, bool $isDirect = true): Response {
-		$federatedUrl = $this->federationService->getRemoteRedirectURL($file);
+		$federatedUrl = $this->federationService->getRemoteRedirectURL($file, null, null, $userId);
 		if ($federatedUrl !== null) {
 			return new RedirectResponse($federatedUrl);
 		}

lib/Service/FederationService.php

@@ -188,7 +188,7 @@ public function getRemoteFileDetails(string $remote, string $remoteToken) {
 	 * @throws NotFoundException
 	 * @throws InvalidPathException
 	 */
-	public function getRemoteRedirectURL(File $item, ?Direct $direct = null, ?IShare $share = null) {
+	public function getRemoteRedirectURL(File $item, ?Direct $direct = null, ?IShare $share = null, ?string $userId = null) {
 		if (!$item->getStorage()->instanceOfStorage(SharingExternalStorage::class)) {
 			return null;
 		}
@@ -199,7 +199,8 @@ public function getRemoteRedirectURL(File $item, ?Direct $direct = null, ?IShare
 		if ($remoteCollabora !== '') {
 			$shareToken = $share ? $share->getToken() : null;
 
-			$wopi = $this->tokenManager->newInitiatorToken($remote, $item, $shareToken, ($direct !== null), ($direct ? $direct->getUid() : null));
+			$initiatorUid = $direct ? $direct->getUid() : $userId;
+			$wopi = $this->tokenManager->newInitiatorToken($remote, $item, $shareToken, ($direct !== null), $initiatorUid);
 			$initiatorServer = $this->urlGenerator->getAbsoluteURL('/');
 			$initiatorToken = $wopi->getToken();