fix(attachments): Uploading of attachments from public shares

The session middleware expects the share token as param `token`. Fixes: #6206 Signed-off-by: Jonas <[email protected]>
nextcloud · Aug 14, 2024 · 7a29b7b · 7a29b7b
1 parent b7c6dc7
commit 7a29b7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/Controller/AttachmentController.php b/lib/Controller/AttachmentController.php
@@ -109,7 +109,7 @@ public function insertAttachmentFile(string $filePath): DataResponse {
 	#[NoAdminRequired]
 	#[PublicPage]
 	#[RequireDocumentSession]
-	public function uploadAttachment(string $shareToken = ''): DataResponse {
+	public function uploadAttachment(string $token = ''): DataResponse {
 		$documentId = $this->getSession()->getDocumentId();
 
 		try {
@@ -120,8 +120,8 @@ public function uploadAttachment(string $shareToken = ''): DataResponse {
 					throw new Exception('Could not read file');
 				}
 				$newFileName = $file['name'];
-				if ($shareToken) {
-					$uploadResult = $this->attachmentService->uploadAttachmentPublic($documentId, $newFileName, $newFileResource, $shareToken);
+				if ($token) {
+					$uploadResult = $this->attachmentService->uploadAttachmentPublic($documentId, $newFileName, $newFileResource, $token);
 				} else {
 					$userId = $this->getSession()->getUserId();
 					$uploadResult = $this->attachmentService->uploadAttachment($documentId, $newFileName, $newFileResource, $userId);

diff --git a/src/services/SessionApi.js b/src/services/SessionApi.js
@@ -147,7 +147,7 @@ export class Connection {
 			+ '?documentId=' + encodeURIComponent(this.#document.id)
 			+ '&sessionId=' + encodeURIComponent(this.#session.id)
 			+ '&sessionToken=' + encodeURIComponent(this.#session.token)
-			+ '&shareToken=' + encodeURIComponent(this.#options.shareToken || '')
+			+ '&token=' + encodeURIComponent(this.#options.shareToken || '')
 		return this.#post(url, formData, {
 			headers: {
 				'Content-Type': 'multipart/form-data',