Merge pull request #990 from solid/feature/acl-check-logger

Made use of aclCheck.configureLogger

Author: kjetilk

lib/create-app.js

@@ -20,10 +20,11 @@ const errorPages = require('./handlers/error-pages')
 const config = require('./server-config')
 const defaults = require('../config/defaults')
 const options = require('./handlers/options')
-const debug = require('./debug').authentication
+const debug = require('./debug')
 const path = require('path')
 const { routeResolvedFile } = require('./utils')
 const ResourceMapper = require('./resource-mapper')
+const aclCheck = require('@solid/acl-check')
 
 const corsSettings = cors({
   methods: [
@@ -59,6 +60,7 @@ function createApp (argv = {}) {
   initAppLocals(app, argv, ldp)
   initHeaders(app)
   initViews(app, configPath)
+  initLoggers()
 
   // Serve the public 'common' directory (for shared CSS files, etc)
   app.use('/common', express.static(path.join(__dirname, '../common')))
@@ -209,7 +211,7 @@ function initWebId (argv, app, ldp) {
     // use Bearer token to authenticate instead of cookie
     // (https://github.com/solid/node-solid-server/pull/835#issuecomment-426429003)
     if (!argv.host.allowsSessionFor(userId, origin, trustedOrigins) && !isLogoutRequest(req)) {
-      debug(`Rejecting session for ${userId} from ${origin}`)
+      debug.authentication(`Rejecting session for ${userId} from ${origin}`)
       // Destroy session data
       delete req.session.userId
       // Ensure this modified session is not saved
@@ -240,6 +242,10 @@ function initWebId (argv, app, ldp) {
   }
 }
 
+function initLoggers () {
+  aclCheck.configureLogger(debug.ACL)
+}
+
 /**
  * Determines whether the given request is a logout request
  */

package-lock.json

@@ -39,7 +39,7 @@
   "bugs": "https://github.com/solid/node-solid-server/issues",
   "dependencies": {
     "@solid/oidc-auth-manager": "^0.17.1",
-    "@solid/acl-check": "^0.1.0",
+    "@solid/acl-check": "^0.1.1",
     "body-parser": "^1.18.3",
     "bootstrap": "^3.3.7",
     "busboy": "^0.2.12",