dylan.derr/Send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into ui

Browse source
This commit is contained in:
Daniela Arcese 2017-06-09 09:47:43 -04:00 • committed by GitHub
commit b442b65f72
11 changed files with 720 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

27
server/portal_server.js
View file

@ -11,10 +11,11 @@ const bytes = require('bytes');
const conf = require('./config.js');
const storage = require('./storage.js');
let notLocalHost =
conf.env === 'production' &&
conf.s3_bucket !== 'localhost' &&
conf.bitly_key !== 'localhost';
let notLocalHost = conf.notLocalHost;
const mozlog = require('./log.js');
let log = mozlog('portal.server');
const app = express();
@ -30,6 +31,13 @@ app.get('/', (req, res) => {
res.render('index');
});
app.get('/exists/:id', (req, res) => {
let id = req.params.id;
storage.exists(id).then(doesExist => {
res.sendStatus(doesExist ? 200 : 404);
});
});
app.get('/download/:id', (req, res) => {
let id = req.params.id;
storage.filename(id).then(filename => {
@ -68,7 +76,7 @@ app.get('/assets/download/:id', (req, res) => {
file_stream.on(notLocalHost ? 'finish' : 'close', () => {
storage.forceDelete(id).then(err => {
if (!err) {
console.log('Deleted.');
log.info('Deleted:', id);
}
});
});
@ -99,7 +107,7 @@ app.post('/delete/:id', (req, res) => {
.delete(id, delete_token)
.then(err => {
if (!err) {
console.log('Deleted.');
log.info('Deleted:', id);
res.sendStatus(200);
}
})
@ -114,8 +122,9 @@ app.post('/upload/:id', (req, res, next) => {
req.pipe(req.busboy);
req.busboy.on('file', (fieldname, file, filename) => {
console.log('Uploading: ' + filename);
const protocol = conf.env === 'development' ? req.protocol : 'https';
log.info('Uploading:', req.params.id);
const protocol = notLocalHost ? 'https' : req.protocol;
let url = `${protocol}://${req.get('host')}/download/${req.params.id}/`;
storage.set(req.params.id, file, filename, url).then(linkAndID => {
@ -125,7 +134,7 @@ app.post('/upload/:id', (req, res, next) => {
});
let server = app.listen(conf.listen_port, () => {
console.log(`Portal app listening on port ${conf.listen_port}!`);
log.info('startServer:', `Portal app listening on port ${conf.listen_port}!`);
});
let validateID = route_id => {