github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Provide filename via Content-Disposition when accessing asset (#16809)

Browse Source 
* Provide filename via Content-Disposition when accessing asset

* Remove unused const

---------

Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
This commit is contained in:
Pascal Jufer
2023-04-11 17:52:09 +02:00
committed by GitHub
parent 3028c645d0
commit b4e9afcc88
3 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/controllers/assets.ts
View File

@@ -1,5 +1,6 @@
import type { Range } from '@directus/storage';
import { parseJSON } from '@directus/utils';
import contentDisposition from 'content-disposition';
import { Router } from 'express';
import { merge, pick } from 'lodash-es';
import { ASSET_TRANSFORM_QUERY_KEYS, SYSTEM_ASSET_ALLOW_LIST } from '../constants.js';
@@ -166,7 +167,8 @@ router.get(
const { stream, file, stat } = await service.getAsset(id, transformation, range);
res.attachment(req.params['filename'] ?? file.filename_download);
const filename = req.params['filename'] ?? file.filename_download;
res.attachment(filename);
res.setHeader('Content-Type', file.type);
res.setHeader('Accept-Ranges', 'bytes');
res.setHeader('Cache-Control', getCacheControlHeader(req, getMilliseconds(env['ASSETS_CACHE_TTL']), false, true));
@@ -186,7 +188,7 @@ router.get(
}
if ('download' in req.query === false) {
res.removeHeader('Content-Disposition');
res.setHeader('Content-Disposition', contentDisposition(filename, { type: 'inline' }));
}
if (req.method.toLowerCase() === 'head') {