zeddemore-logger 1.0.5 → 1.0.6

package/lib/zeddemore-logger.js

@@ -217,22 +217,25 @@ class ZeddemoreLogger {
 
     requestLoggerMiddleware = (req, res, next) => {
         const requestValues = parseRequest(req);
-        const requestId = uuid();//this.#generateUuid();
+        const requestId = this.#generateUuid();
         req[ this.requestIdAttribute ] = requestId;
         res.header(rqh.REQUEST_ID, requestId);
         const ipAddress = requestValues.ipAddress;
+        res.locals = res.locals || { };
         res.locals.user = res.locals.user || { };
         res.locals.user.logger = this.createRequestLogger(requestId, ipAddress);
         return next();
     }
 
     #userGetFn(req, res) {
-        return (res.locals ? res.locals.user : null) || (req.locals ? req.locals.user : null) || req.user || null;
+        return ((res && res.locals) ? res.locals.user : null)
+            || ((req && req.locals) ? req.locals.user : null)
+            || (req ? req.user : null);
     }
 
     userLoggerMiddleware = (req, res, next) => {
         const requestId = this.#getRequestId(req);
-        const user = res.locals.user || { };
+        const user = this.userGetFn(req, res) || { };
         if (!requestId) return next();
         const username = user.login || null;
         let ipAddress = user.ipAddress || null;
@@ -243,6 +246,7 @@ class ZeddemoreLogger {
         let userLogLevel = !_.isNil(user.logLevel) ? user.logLevel : this.defaultUserLogLevel;
         if (userLogLevel < 0) userLogLevel = this.logLevel;
         const level = this.forceLogLevel ? this.logLevel : userLogLevel;
+        res.locals = res.locals || { };
         res.locals.user = res.locals.user || user;
         res.locals.user.logger = this.createUserLogger(requestId, username, level, ipAddress);
         return next();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zeddemore-logger",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "Node.js Express logger using Morgan and Winston for thread and caller info tracking",
   "repository": {
     "type": "git",