cartodb/CartoDB-SQL-API
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract filename default vaule to a middleware

Browse Source
This commit is contained in:
Daniel García Aubert 2019-05-31 12:08:18 +02:00
parent 8ab98f705d
commit e991511434
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/controllers/copy_controller.js
View File

@ -53,6 +53,7 @@ CopyController.prototype.route = function (app) {
connectionParamsMiddleware(this.userDatabaseService),
validateCopyQuery(),
handleQueryMiddleware(),
getFilenameParam(),
handleCopyTo(this.logger),
errorHandler(this.logger),
errorMiddleware()
@ -64,11 +65,9 @@ CopyController.prototype.route = function (app) {
app.post(`${base_url}/sql/copyto`, copyToMiddlewares(RATE_LIMIT_ENDPOINTS_GROUPS.COPY_TO));
};
function handleCopyTo (logger) {
return function handleCopyToMiddleware (req, res, next) {
const { sql, userDbParams, user } = res.locals;
const filename = ( req.query.filename || req.body && req.body.filename) || 'carto-sql-copyto.dmp';
const { sql, filename, userDbParams, user } = res.locals;
// it is not sure, nginx may choose not to compress the body
// but we want to know it and save it in the metrics
@ -170,6 +169,20 @@ function handleCopyFrom (logger) {
};
}
function getFilenameParam () {
return function getFilenameParamMiddleware (req, res, next) {
let filename = (req.query && req.query.filename) || (req.body && req.body.filename);
if (!filename) {
filename = 'carto-sql-copyto.dmp';
}
res.locals.filename = filename;
next();
};
}
function validateCopyQuery () {
return function validateCopyQueryMiddleware (req, res, next) {
const sql = req.query.q || (req.body && req.body.q);