Skip to content

improve(response-rendering): give Content-Disposition render priority #4140

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
merged 13 commits into from
Jan 20, 2018
Merged

improve(response-rendering): give Content-Disposition render priority #4140

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
350595f
Remove produces/consumes setter from OperationContainer
shockey Jan 19, 2018
2940e18
Store consumes/produces information in `meta` key
shockey Jan 19, 2018
99e3735
Migrate produces value state usage to `meta` key
shockey Jan 19, 2018
3be737a
use meta consumes data for isXml check
shockey Jan 19, 2018
2950e0f
Fix failing tests
shockey Jan 19, 2018
58eda41
normalize action name casing
shockey Jan 19, 2018
862a811
restore correct produces fallback value logic
shockey Jan 19, 2018
d56b238
default to first server if current server is invalid
shockey Jan 20, 2018
7d51dbe
Merge branch 'master' of github.com:swagger-api/swagger-ui
shockey Jan 20, 2018
2d593cf
improve(response-rendering): give Content-Disposition render priority
shockey Jan 20, 2018
5b2caf6
Merge branch 'master' into master
shockey Jan 20, 2018
cfb7673
Merge branch 'master' of github.com:swagger-api/swagger-ui
shockey Jan 20, 2018
622d9bc
Merge branch 'master' of github.com:shockey/swagger-ui
shockey Jan 20, 2018
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
71 changes: 35 additions & 36 deletions src/core/components/response-body.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,41 @@ export default class ResponseBody extends React.Component {
let body, bodyEl
url = url || ""

// JSON
if (/json/i.test(contentType)) {
if (
/^application\/octet-stream/i.test(contentType) ||
(headers["Content-Disposition"] && (/attachment/i).test(headers["Content-Disposition"])) ||
(headers["content-disposition"] && (/attachment/i).test(headers["content-disposition"])) ||
(headers["Content-Description"] && (/File Transfer/i).test(headers["Content-Description"])) ||
(headers["content-description"] && (/File Transfer/i).test(headers["content-description"]))) {
// Download

const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent)

if (!isSafari && "Blob" in window) {
let type = contentType || "text/html"
let blob = (content instanceof Blob) ? content : new Blob([content], {type: type})
let href = window.URL.createObjectURL(blob)
let fileName = url.substr(url.lastIndexOf("/") + 1)
let download = [type, fileName, href].join(":")

// Use filename from response header,
// First check if filename is quoted (e.g. contains space), if no, fallback to not quoted check
let disposition = headers["content-disposition"] || headers["Content-Disposition"]
if (typeof disposition !== "undefined") {
let responseFilename = extractFileNameFromContentDispositionHeader(disposition)
if (responseFilename !== null) {
download = responseFilename
}
}

bodyEl = <div><a href={ href } download={ download }>{ "Download file" }</a></div>
} else {
bodyEl = <pre>Download headers detected but your browser does not support downloading binary via XHR (Blob).</pre>
}

// Anything else (CORS)
} else if (/json/i.test(contentType)) {
// JSON
try {
body = JSON.stringify(JSON.parse(content), null, " ")
} catch (error) {
Expand Down Expand Up @@ -53,40 +86,6 @@ export default class ResponseBody extends React.Component {
// Audio
} else if (/^audio\//i.test(contentType)) {
bodyEl = <pre><audio controls><source src={ url } type={ contentType } /></audio></pre>

// Download
} else if (
/^application\/octet-stream/i.test(contentType) ||
(headers["Content-Disposition"] && (/attachment/i).test(headers["Content-Disposition"])) ||
(headers["content-disposition"] && (/attachment/i).test(headers["content-disposition"])) ||
(headers["Content-Description"] && (/File Transfer/i).test(headers["Content-Description"])) ||
(headers["content-description"] && (/File Transfer/i).test(headers["content-description"]))) {

const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent)

if (!isSafari && "Blob" in window) {
let type = contentType || "text/html"
let blob = (content instanceof Blob) ? content : new Blob([content], {type: type})
let href = window.URL.createObjectURL(blob)
let fileName = url.substr(url.lastIndexOf("/") + 1)
let download = [type, fileName, href].join(":")

// Use filename from response header,
// First check if filename is quoted (e.g. contains space), if no, fallback to not quoted check
let disposition = headers["content-disposition"] || headers["Content-Disposition"]
if (typeof disposition !== "undefined") {
let responseFilename = extractFileNameFromContentDispositionHeader(disposition)
if (responseFilename !== null) {
download = responseFilename
}
}

bodyEl = <div><a href={ href } download={ download }>{ "Download file" }</a></div>
} else {
bodyEl = <pre>Download headers detected but your browser does not support downloading binary via XHR (Blob).</pre>
}

// Anything else (CORS)
} else if (typeof content === "string") {
bodyEl = <HighlightCode value={ content } />
} else if ( content.size > 0 ) {
Expand Down