Browse Source

Fix download of backupa archive

pull/38/head
Kristijan Mitrovic 4 years ago
parent
commit
eec75eb860
2 changed files with 21 additions and 12 deletions
  1. +20
    -10
      src/_helpers/util.js
  2. +1
    -2
      src/_services/network.service.js

+ 20
- 10
src/_helpers/util.js View File

@@ -184,21 +184,31 @@ export const util = {
}
},

handleResponseToDownloadAsFile: function(fileName) {
return function(response) {
return downloadBlob(response.blob(), fileName);
};
},

handleDataToDownloadAsFile: function(fileName, mimeType) {
return function(data) {
// Original taken from: https://javascript.info/blob#blob-as-url
const uri = URL.createObjectURL(new Blob([data], {type: mimeType}));
try {
util.downloadURI(uri, fileName);
} catch(err) {
return Promise.reject(err);
} finally {
URL.revokeObjectURL(uri);
}
return 'ok';
return downloadBlob(new Blob([data], {type: mimeType}), fileName);
};
},

downloadBlob: function(blob, fileName) {
// Original taken from: https://javascript.info/blob#blob-as-url
const uri = URL.createObjectURL(blob);
try {
util.downloadURI(uri, fileName);
} catch(err) {
return Promise.reject(err);
} finally {
URL.revokeObjectURL(uri);
}
return 'ok';
},

downloadURI: function(uri, name) {
const link = document.createElement("a");
link.download = name;


+ 1
- 2
src/_services/network.service.js View File

@@ -93,8 +93,7 @@ function retrieveBackupPackage(userId, networkId, code, password, backupId, mess
return fetch(
`${config.apiUrl}/users/${userId}/networks/${networkId}/actions/keys/${code}/backups/${backupId}/download`,
util.postWithAuth({ name: 'password', value: password })
).then(r => r.text())
.then(util.handleDataToDownloadAsFile('backup.' + networkId + '.zip.cpt', 'application/octet-stream'));
).then(util.handleResponseToDownloadAsFile('backup.' + networkId + '.tgz.enc'));
}

function getNetworkBackups(userId, networkId, messages, errors) {


Loading…
Cancel
Save