Merge pull request #3683 from nextcloud/backport/3681/stable28

nextcloud · May 8, 2024 · c3c1a50 · c3c1a50
2 parents bb4e6cc + fa2784d
commit c3c1a50
Show file tree

Hide file tree

Showing 6 changed files with 442 additions and 680 deletions.
diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php
@@ -383,6 +383,8 @@ public function token(int $fileId, ?string $shareToken = null, ?string $path = n
 
 			$wopi = $this->getToken($file, $share);
 
+			$this->tokenManager->setGuestName($wopi, $guestName);
+
 			return new DataResponse(array_merge(
 				[ 'urlSrc' => $this->tokenManager->getUrlSrc($file) ],
 				$wopi->jsonSerialize(),

diff --git a/lib/TokenManager.php b/lib/TokenManager.php
@@ -313,6 +313,15 @@ public function updateGuestName(string $accessToken, string $guestName) {
 		$this->wopiMapper->update($wopi);
 	}
 
+	public function setGuestName(Wopi $wopi, ?string $guestName = null): Wopi {
+		if ($wopi->getTokenType() !== Wopi::TOKEN_TYPE_GUEST && $wopi->getTokenType() !== Wopi::TOKEN_TYPE_REMOTE_GUEST) {
+			return $wopi;
+		}
+
+		$wopi->setGuestDisplayname($this->prepareGuestName($guestName));
+		return $this->wopiMapper->update($wopi);
+	}
+
 	public function getUrlSrc(File $file): string {
 		return $this->wopiParser->getUrlSrcValue($file->getMimeType());
 	}