Skip to content

[modules | media] Fix media upload error handling for non-JSON server responses #10700

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
driusan merged 2 commits into from
Jun 30, 2026
+7 −5
Merged

[modules | media] Fix media upload error handling for non-JSON server responses #10700

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89b0eff
Fix media upload error handling for non-JSON server responses
priyavrat7 Jun 29, 2026
8ac2bb0
Log warning when upload error response is not valid JSON
priyavrat7 Jun 30, 2026
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
12 changes: 7 additions & 5 deletions modules/media/jsx/uploadForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,16 +345,18 @@ class MediaUploadForm extends Component {
} else {
let msg = this.props.t('Upload error!', {ns: 'media'});

if (xhr.response) {
if (xhr.statusText) {
msg = JSON.parse(xhr.response).message;
}
}
if (xhr.status === 409) {
msg = this.props.t('A file with the same name already exists!',
{ns: 'media'});
} else if (xhr.status === 413) {
msg = this.props.t('File too large!', {ns: 'media'});
} else if (xhr.response) {
try {
msg = JSON.parse(xhr.response).message;
} catch (e) {
// Ignore non-JSON responses.

@driusan driusan Jun 30, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we console.warn the error if it's not?

@priyavrat7 priyavrat7 Jun 30, 2026 •
edited
Loading

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hello @driusan, the msg was already initialized at line 346, so ideally we do not need to do anything inside catch block. But if you suggest we can do something like this console.warn('Upload response was not valid JSON.'); for developers

@driusan driusan Jun 30, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I meant something like:

console.warn('Failed upload response was not valid JSON', e);

so that the error isn't lost silently in case it was significant. The try / catch is catching all errors.

console.warn('Upload response was not valid JSON', e);
}
}

this.setState({
Expand Down
Loading