wait-what/FoundKey
1
0
Fork 0
forked from FoundKeyGang/FoundKey
Code Issues Pull requests Packages Projects Releases Wiki Activity

[Server] Fix bug

Browse source
This commit is contained in:
syuilo 2017-02-06 22:04:00 +09:00
parent 1113e0bfa5
commit cb134bb818
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/file/server.ts
View file

@ -90,28 +90,40 @@ function send(data: Buffer, type: string, req: express.Request, res: express.Res
* Routing * Routing
*/ */
app.get('/:id', async (req, res): Promise<void> => { app.get('/:id', async (req, res) => {
// Validate id
if (!mongodb.ObjectID.isValid(req.params.id)) {
res.status(400).send('incorrect id');
return;
}
const file = await File.findOne({_id: new mongodb.ObjectID(req.params.id)}); const file = await File.findOne({_id: new mongodb.ObjectID(req.params.id)});
if (file == null) { if (file == null) {
res.status(404).sendFile(__dirname + '/resources/dummy.png'); res.status(404).sendFile(__dirname + '/resources/dummy.png');
return; return;
} else if (file.data == null) { } else if (file.data == null) {
res.status(400); res.sendStatus(400);
return; return;
} }
send(file.data.buffer, file.type, req, res); send(file.data.buffer, file.type, req, res);
}); });
app.get('/:id/:name', async (req, res): Promise<void> => { app.get('/:id/:name', async (req, res) => {
// Validate id
if (!mongodb.ObjectID.isValid(req.params.id)) {
res.status(400).send('incorrect id');
return;
}
const file = await File.findOne({_id: new mongodb.ObjectID(req.params.id)}); const file = await File.findOne({_id: new mongodb.ObjectID(req.params.id)});
if (file == null) { if (file == null) {
res.status(404).sendFile(__dirname + '/resources/dummy.png'); res.status(404).sendFile(__dirname + '/resources/dummy.png');
return; return;
} else if (file.data == null) { } else if (file.data == null) {
res.status(400); res.sendStatus(400);
return; return;
} }