verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

refs #6184 saveCmr #1788

Merged
guillermo merged 58 commits from 6184-saveCmr into dev 2024-02-13 06:47:06 +00:00
Conversation 2 Commits 58 Files Changed 27 +8 -7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 64ca72b1f4 - Show all commits

13
modules/route/back/methods/route/downloadCmrsZip.js
View File

@ -37,7 +37,6 @@ module.exports = Self => {
Self.downloadCmrsZip = async function(ctx, ids, options) { Self.downloadCmrsZip = async function(ctx, ids, options) {
const models = Self.app.models; const models = Self.app.models;
const myOptions = {}; const myOptions = {};
const token = ctx.req.accessToken;
const zip = new JSZip(); const zip = new JSZip();
if (typeof options == 'object') if (typeof options == 'object')
@ -47,15 +46,17 @@ module.exports = Self => {
let totalSize = 0; let totalSize = 0;
ids = ids.split(','); ids = ids.split(',');
try { try {
for (let id of ids) { const baseUrl = (await Self.app.models.Url.getUrl()).replace('#!', 'api');
for (const id of ids) {
if (zipConfig && totalSize > zipConfig.maxSize) throw new UserError('Files are too large'); if (zipConfig && totalSize > zipConfig.maxSize) throw new UserError('Files are too large');
const baseUrl = (ctx.req.headers.origin)
? `${ctx.req.headers.origin}/api`
: `${ctx.req.headers.referer}api`
const response = await axios.get( const response = await axios.get(
`${baseUrl}/Routes/${id}/cmr?access_token=${token.id}`, { `${baseUrl}Routes/${id}/cmr`, {
...myOptions, ...myOptions,
headers: {
Authorization: ctx.req.accessToken.id
},
responseType: 'arraybuffer', responseType: 'arraybuffer',
}); });