Skip to content
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

Jump to bottom

Fix downloads in Chrome with xsrf token #6686

Merged
merged 2 commits into from Aug 9, 2019
Merged

Fix downloads in Chrome with xsrf token #6686

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
c9d5075
Fix downloads in Chrome with xsrf token
tslaton Jun 21, 2019
220d908
Merge branch 'master' into fix-chrome-downloads
jasongrout Aug 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 12 additions & 18 deletions packages/filebrowser/src/model.ts
View file
Open in desktop
Expand Up @@ -312,24 +312,18 @@ export class FileBrowserModel implements IDisposable {
* @returns A promise which resolves when the file has begun
* downloading.
*/
download(path: string): Promise<void> {
return this.manager.services.contents.getDownloadUrl(path).then(url => {
// Check the browser is Chrome https://stackoverflow.com/a/9851769
const chrome = (window as any).chrome;
const isChrome = !!chrome && (!!chrome.webstore || !!chrome.runtime);
if (isChrome) {
// Workaround https://bugs.chromium.org/p/chromium/issues/detail?id=455987
window.open(url);
} else {
let element = document.createElement('a');
document.body.appendChild(element);
element.setAttribute('href', url);
element.setAttribute('download', '');
element.click();
document.body.removeChild(element);
return void 0;
}
});
async download(path: string): Promise<void> {
const url = await this.manager.services.contents.getDownloadUrl(path);
let element = document.createElement('a');
document.body.appendChild(element);
element.setAttribute('href', url);
// Chrome doesn't get the right name automatically
const parts = path.split('/');
const name = parts[parts.length - 1];
element.setAttribute('download', name);
element.click();
document.body.removeChild(element);
return void 0;
}

/**
Expand Down
9 changes: 6 additions & 3 deletions packages/services/src/contents/index.ts
View file
Open in desktop
Expand Up @@ -1044,9 +1044,12 @@ export class Drive implements Contents.IDrive {
*/
getDownloadUrl(localPath: string): Promise<string> {
let baseUrl = this.serverSettings.baseUrl;
return Promise.resolve(
URLExt.join(baseUrl, FILES_URL, URLExt.encodeParts(localPath))
);
let url = URLExt.join(baseUrl, FILES_URL, URLExt.encodeParts(localPath));
const xsrfTokenMatch = document.cookie.match('\\b_xsrf=([^;]*)\\b');
if (xsrfTokenMatch) {
url = URLExt.join(url, `?_xsrf=${xsrfTokenMatch[1]}`);
}
return Promise.resolve(url);
}

/**
Expand Down