Merge pull request #6214 from nextcloud/backport/6211/stable28

[stable28] fix(attachments): Uploading of attachments from public shares
nextcloud · Aug 28, 2024 · 2e65baa · 2e65baa
2 parents 5e00fb7 + eac32b4
commit 2e65baa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/lib/Controller/AttachmentController.php b/lib/Controller/AttachmentController.php
@@ -126,7 +126,7 @@ public function insertAttachmentFile(string $filePath): DataResponse {
 	#[NoAdminRequired]
 	#[PublicPage]
 	#[RequireDocumentSession]
-	public function uploadAttachment(?string $shareToken = null): DataResponse {
+	public function uploadAttachment(?string $token = null): DataResponse {
 		$documentId = $this->getSession()->getDocumentId();
 
 		try {
@@ -137,8 +137,8 @@ public function uploadAttachment(?string $shareToken = null): 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/components/Editor/MediaHandler.vue b/src/components/Editor/MediaHandler.vue
@@ -127,8 +127,8 @@ export default {
 
 			return Promise.all(uploadPromises)
 				.catch(error => {
-					logger.error('Uploading multiple images failed', { error })
-					showError(error?.response?.data?.error || error.message)
+					logger.error('Uploading multiple attachments failed', { error })
+					showError(t('text', 'Uploading multiple attachments failed.'))
 				})
 				.then(() => {
 					this.state.isUploadingAttachments = false
@@ -145,8 +145,8 @@ export default {
 					)
 				})
 				.catch((error) => {
-					logger.error('Uploading image failed', { error })
-					showError(error?.response?.data?.error)
+					logger.error('Uploading attachment failed', { error })
+					showError(t('text', 'Uploading attachment failed.'))
 				})
 				.then(() => {
 					this.state.isUploadingAttachments = false
@@ -173,8 +173,8 @@ export default {
 					null, response.data?.dirname,
 				)
 			}).catch((error) => {
-				logger.error('Failed to insert image path', { error })
-				showError(error?.response?.data?.error || error.message)
+				logger.error('Failed to insert from Files', { error })
+				showError(t('text', 'Failed to insert from Files'))
 			}).then(() => {
 				this.state.isUploadingAttachments = false
 			})

diff --git a/src/services/SessionApi.js b/src/services/SessionApi.js
@@ -164,7 +164,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',