expired ids should reject instead of returning null

This commit is contained in:
Danny Coates 2017-07-25 12:00:52 -07:00
parent 0761fcf902
commit 15ac0e1d49
No known key found for this signature in database
GPG Key ID: 4C442633C62E00CB
2 changed files with 8 additions and 9 deletions

View File

@ -117,7 +117,7 @@ app.get('/download/:id', (req, res) => {
}
storage.filename(id).then(filename => {
storage
return storage
.length(id)
.then(contentLength => {
storage.ttl(id).then(timeToExpiry => {
@ -128,11 +128,11 @@ app.get('/download/:id', (req, res) => {
timeToExpiry: timeToExpiry
});
});
});
})
.catch(() => {
res.status(404).render('notfound');
});
});
});;
});
app.get('/assets/download/:id', (req, res) => {

View File

@ -90,11 +90,10 @@ function ttl(id) {
function filename(id) {
return new Promise((resolve, reject) => {
redis_client.hget(id, 'filename', (err, reply) => {
if (!err) {
resolve(reply);
} else {
reject(err);
if (err || !reply) {
return reject();
}
resolve(reply);
});
});
}