Skip to content

fix(attachments): Uploading of attachments from public shares #6211

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mejo- merged 2 commits into from
Aug 15, 2024
Merged

fix(attachments): Uploading of attachments from public shares #6211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7c6dc7
fix(MediaHandler): Show proper error message on upload failure
mejo- Aug 14, 2024
7a29b7b
fix(attachments): Uploading of attachments from public shares
mejo- Aug 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/Controller/AttachmentController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions src/components/Editor/MediaHandler.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,8 +110,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
Expand All @@ -128,8 +128,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
Expand All @@ -156,8 +156,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
})
Expand Down
2 changes: 1 addition & 1 deletion src/services/SessionApi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down