web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix downloading file from the drive

Browse Source
This commit is contained in:
yflory 2019-08-26 18:17:39 +02:00
parent a67f7d3edb
commit 3f6e64338a
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
www/common/make-backup.js
View File

@ -55,7 +55,7 @@ define([
var hash = parsed.hash; var hash = parsed.hash;
var name = fData.filename || fData.title; var name = fData.filename || fData.title;
var secret = Hash.getSecrets('file', hash, fData.password); var secret = Hash.getSecrets('file', hash, fData.password);
var src = Hash.getBlobPathFromHex(secret.channel); var src = (ctx.fileHost || '') + Hash.getBlobPathFromHex(secret.channel);
var key = secret.keys && secret.keys.cryptKey; var key = secret.keys && secret.keys.cryptKey;
Util.fetch(src, function (err, u8) { Util.fetch(src, function (err, u8) {
if (cancelled) { return; } if (cancelled) { return; }
@ -266,10 +266,11 @@ define([
}; };
// Main function. Create the empty zip and fill it starting from drive.root // Main function. Create the empty zip and fill it starting from drive.root
var create = function (data, getPad, cb, progress) { var create = function (data, getPad, fileHost, cb, progress) {
if (!data || !data.uo || !data.uo.drive) { return void cb('EEMPTY'); } if (!data || !data.uo || !data.uo.drive) { return void cb('EEMPTY'); }
var sem = Saferphore.create(5); var sem = Saferphore.create(5);
var ctx = { var ctx = {
fileHost: fileHost,
get: getPad, get: getPad,
data: data.uo.drive, data: data.uo.drive,
folder: data.folder || ctx.data.root, folder: data.folder || ctx.data.root,

2
www/common/sframe-common-file.js
View File

@ -595,7 +595,9 @@ define([
}); });
}; };
var privateData = common.getMetadataMgr().getPrivateData();
var ctx = { var ctx = {
fileHost: privateData.fileHost,
get: common.getPad, get: common.getPad,
sframeChan: sframeChan, sframeChan: sframeChan,
}; };

2
www/file/inner.js
View File

@ -59,7 +59,7 @@ define([
var secret; var secret;
var metadataMgr = common.getMetadataMgr(); var metadataMgr = common.getMetadataMgr();
var priv = metadataMgr.getPrivateData(); var priv = metadataMgr.getPrivateData();
var fileHost = priv.fileHost || priv.origin; var fileHost = priv.fileHost || priv.origin || '';
if (!priv.filehash) { if (!priv.filehash) {
uploadMode = true; uploadMode = true;

2
www/settings/inner.js
View File

@ -1085,7 +1085,7 @@ define([
var todo = function (data, filename) { var todo = function (data, filename) {
var ui = createExportUI(); var ui = createExportUI();
var bu = Backup.create(data, common.getPad, function (blob, errors) { var bu = Backup.create(data, common.getPad, privateData.fileHost, function (blob, errors) {
saveAs(blob, filename); saveAs(blob, filename);
sframeChan.event('EV_CRYPTGET_DISCONNECT'); sframeChan.event('EV_CRYPTGET_DISCONNECT');
ui.complete(function () { ui.complete(function () {