Move filename validation out of the Router and into the FilesAdaptor (#6157)
* Move filename validation out of the Router and into the FilesAdaptor * Address PR comments * Update unittests to handle FilesAdapter interface change * Make validateFilename optional
This commit is contained in:
committed by
Diamond Lewis
parent
93fe6b44e4
commit
1c8d4a6519
@@ -1,7 +1,7 @@
|
||||
// FilesController.js
|
||||
import { randomHexString } from '../cryptoUtils';
|
||||
import AdaptableController from './AdaptableController';
|
||||
import { FilesAdapter } from '../Adapters/Files/FilesAdapter';
|
||||
import { validateFilename, FilesAdapter } from '../Adapters/Files/FilesAdapter';
|
||||
import path from 'path';
|
||||
import mime from 'mime';
|
||||
|
||||
@@ -95,6 +95,13 @@ export class FilesController extends AdaptableController {
|
||||
handleFileStream(config, filename, req, res, contentType) {
|
||||
return this.adapter.handleFileStream(filename, req, res, contentType);
|
||||
}
|
||||
|
||||
validateFilename(filename) {
|
||||
if (typeof this.adapter.validateFilename === 'function') {
|
||||
return this.adapter.validateFilename(filename);
|
||||
}
|
||||
return validateFilename(filename);
|
||||
}
|
||||
}
|
||||
|
||||
export default FilesController;
|
||||
|
||||
Reference in New Issue
Block a user