summaryrefslogtreecommitdiff
authorMichael Krelin <hacker@klever.net>2014-07-01 17:49:10 (UTC)
committer Michael Krelin <hacker@klever.net>2014-07-01 17:49:10 (UTC)
commita6e5df547739ac91055ae0ae4928447c9ec50a98 (patch) (unidiff)
treee5d2e63d8c782bb471fa95bd8c7d6d21e3c322b0
parentb9ee39b810aae10da83534776028585309b53a24 (diff)
downloadclipperz-a6e5df547739ac91055ae0ae4928447c9ec50a98.zip
clipperz-a6e5df547739ac91055ae0ae4928447c9ec50a98.tar.gz
clipperz-a6e5df547739ac91055ae0ae4928447c9ec50a98.tar.bz2
clipperz middleware as a router instead of two separate handlers and staticHEADmaster
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--backend/node/src/app.js7
-rw-r--r--backend/node/src/clipperz.js6
2 files changed, 10 insertions, 3 deletions
diff --git a/backend/node/src/app.js b/backend/node/src/app.js
index bbc62f8..09dcfac 100644
--- a/backend/node/src/app.js
+++ b/backend/node/src/app.js
@@ -35,10 +35,11 @@ app.use(require('body-parser').urlencoded({extended:true}));
35app.use(require('cookie-parser')('your secret here')); 35app.use(require('cookie-parser')('your secret here'));
36app.use(require('express-session')({secret:'99 little bugs in the code', key:'sid', store: clipperz.session_store(), resave: false, saveUninitialized: false })); 36app.use(require('express-session')({secret:'99 little bugs in the code', key:'sid', store: clipperz.session_store(), resave: false, saveUninitialized: false }));
37 37
38app.post('/json',clipperz.json); 38/* Like this: */
39app.get('/dump',clipperz.dump); 39app.use(clipperz.router);
40/* Or this: */
41app.use('/clz/',clipperz.router);
40 42
41app.use(EXPRESS.static(PATH.join(__dirname, 'htdocs/')));
42if ('development' == app.get('env')) { 43if ('development' == app.get('env')) {
43 app.use(require('express-error-with-sources')()); 44 app.use(require('express-error-with-sources')());
44} 45}
diff --git a/backend/node/src/clipperz.js b/backend/node/src/clipperz.js
index 842de31..2a3df73 100644
--- a/backend/node/src/clipperz.js
+++ b/backend/node/src/clipperz.js
@@ -2,6 +2,8 @@ var FS = require('fs');
2var CRYPTO = require('crypto'); 2var CRYPTO = require('crypto');
3var BIGNUM = require('bignum'); 3var BIGNUM = require('bignum');
4var ASYNC = require('async'); 4var ASYNC = require('async');
5var EXPRESS = require('express');
6var PATH = require('path');
5 7
6var express_store = require('express-session').Store; 8var express_store = require('express-session').Store;
7 9
@@ -579,6 +581,10 @@ var CLIPPERZ = module.exports = function(CONFIG) {
579 }; 581 };
580 rv.__defineGetter__('session_store',function(){ return function(o) { return new (clipperz_store(PG))(o) } }); 582 rv.__defineGetter__('session_store',function(){ return function(o) { return new (clipperz_store(PG))(o) } });
581 583
584 (rv.router = require('express').Router())
585 .post('/json',rv.json).get('/dump',rv.dump)
586 .use(EXPRESS.static(PATH.join(__dirname,'htdocs/')));
587
582 return rv; 588 return rv;
583 589
584}; 590};