Skip to content

Commit decbe83

Browse files
author
Andrei
committed
Merge pull request #187 from nicola/handlers
WIP: Exporting handlers as module
2 parents 90630d5 + 406877c commit decbe83

8 files changed

Lines changed: 29 additions & 40 deletions

File tree

‎lib/handlers/delete.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
exports.handler = handler
1+
module.exports = handler
22

33
var debug = require('../debug').handlers
44

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
exports.handler = errorPageHandler
1+
module.exports = handler
22

33
var debug = require('../debug').server
44
var fs = require('fs')
55

6-
function errorPageHandler (err, req, res, next) {
6+
function handler (err, req, res, next) {
77
debug('Error page because of ' + err.message)
88

99
var ldp = req.app.locals.ldp

‎lib/handlers/get.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
exports.handler = get
1+
module.exports = handler
22

33
var fs = require('fs')
44
var glob = require('glob')
@@ -26,7 +26,7 @@ var RDFs = [
2626
'application/x-turtle'
2727
]
2828

29-
function get (req, res, next) {
29+
function handler (req, res, next) {
3030
var ldp = req.app.locals.ldp
3131
var includeBody = req.method === 'GET'
3232
var negotiator = new Negotiator(req)

‎lib/handlers/patch.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
exports.handler = handler
1+
module.exports = handler
22

33
var mime = require('mime')
44
mime.default_type = 'text/turtle'

‎lib/handlers/post.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
exports.handler = handler
1+
module.exports = handler
22

33
var debug = require('../debug').handlers
4-
var header = require('../header.js')
5-
var patch = require('./patch.js')
4+
var header = require('../header')
5+
var patch = require('./patch')
66
var error = require('../http-error')
77

88
function handler (req, res, next) {
@@ -13,7 +13,7 @@ function handler (req, res, next) {
1313
if (contentType === 'application/sparql' ||
1414
contentType === 'application/sparql-update') {
1515
debug('POST -- Handling sparql query via PATCH')
16-
return patch.handler(req, res, next)
16+
return patch(req, res, next)
1717
}
1818

1919
var containerPath = req.path

‎lib/handlers/put.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
exports.handler = handler
1+
module.exports = handler
22

33
var debug = require('../debug').handlers
44

‎lib/identity-provider.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var waterfall = async.waterfall
1111
var debug = require('./debug').idp
1212
var express = require('express')
1313
var bodyParser = require('body-parser')
14-
var errorHandler = require('./handlers/error')
14+
var errorHandler = require('./handlers/error-pages')
1515
var url = require('url')
1616
var uriAbs = require('./utils').uriAbs
1717
var forge = require('node-forge')
@@ -475,6 +475,6 @@ IdentityProvider.prototype.middleware = function (corsSettings) {
475475
var host = uriAbs(req)
476476
res.redirect('https://solid.github.io/solid-signup/?domain=' + host + '&acc=accounts/new&crt=accounts/cert')
477477
})
478-
router.use(errorHandler.handler)
478+
router.use(errorHandler)
479479
return router
480480
}

‎lib/ldp-middleware.js‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ var responseTime = require('response-time')
66
var header = require('./header')
77
var acl = require('./acl')
88
var login = require('./login')
9-
var getHandler = require('./handlers/get.js')
10-
var postHandler = require('./handlers/post.js')
11-
var putHandler = require('./handlers/put.js')
12-
var deleteHandler = require('./handlers/delete.js')
13-
var patchHandler = require('./handlers/patch.js')
14-
var errorHandler = require('./handlers/error.js')
9+
var get = require('./handlers/get')
10+
var post = require('./handlers/post')
11+
var put = require('./handlers/put')
12+
var del = require('./handlers/delete')
13+
var patch = require('./handlers/patch')
14+
var errorPages = require('./handlers/error-pages')
1515

1616
function LdpMiddleware (corsSettings) {
1717
var router = express.Router('/')
@@ -36,30 +36,19 @@ function LdpMiddleware (corsSettings) {
3636
})
3737

3838
router.use('/*', login.loginHandler)
39+
router.get('/*', acl.allow('Read'), get)
40+
router.post('/*', acl.allow('Append'), post)
41+
router.patch('/*', acl.allow('Append'), patch)
42+
router.put('/*', acl.allow('Append'), put)
43+
router.delete('/*', acl.allow('Write'), del)
44+
45+
// Errors
46+
router.use(errorPages)
47+
router.use(responseTime())
3948

40-
// ACL handlers
41-
router.get('/*', acl.allow('Read'))
42-
router.head('/*', acl.allow('Read'))
43-
router.post('/*', acl.allow('Append'))
44-
router.patch('/*', acl.allow('Append'))
45-
router.put('/*', acl.allow('Append'))
46-
router.delete('/*', acl.allow('Write'))
47-
48-
// Convert json-ld and nquads to turtle
4949
// TODO: in the process of being deprecated
50+
// Convert json-ld and nquads to turtle
5051
// router.use('/*', parse.parseHandler)
5152

52-
// Add response time
53-
router.use(responseTime())
54-
55-
// HTTP methods handlers
56-
router.get('/*', getHandler.handler)
57-
router.put('/*', putHandler.handler)
58-
router.delete('/*', deleteHandler.handler)
59-
router.post('/*', postHandler.handler)
60-
router.patch('/*', patchHandler.handler)
61-
62-
// Error handling
63-
router.use(errorHandler.handler)
6453
return router
6554
}

0 commit comments

Comments
 (0)