@@ -6,12 +6,12 @@ var responseTime = require('response-time')
66var header = require ( './header' )
77var acl = require ( './acl' )
88var 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
1616function 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