playov2-js-utilities 0.3.21 → 0.3.24

package/lib/middleware.js

@@ -1,23 +1,42 @@
 
-const { v4: uuidv4, v4 } = require('uuid');
+const { v4: uuidv4 } = require('uuid');
 const Logger = require('./logger')
 
-const playoServiceRequestInterceptor = (req, res, next, service =  'microservice-name') => {
+const playoServiceRequestInterceptor = (req, res, next, service = 'microservice-name') => {
     const id = req.headers["x-request-id"] || uuidv4();
     const start = Date.now();
+    let userId = 'internal-request';
+    if (req.headers.userinfo) {
+        try {
+            userId = JSON.parse(userinfo).userId
+        } catch (error) {
+            Logger.prepareInfoLog(id, { userinfo: req.headers.userinfo }, "Malformed userInfo in headers detected");
+        }
+    }
+    const requestDetails = {
+        method: req.method,
+        params: req.params,
+        query: req.query,
+        url: req.url,
+        originalUrl: req.originalUrl,
+        service
+    };
+    if (req.body.length < 10000) { // 0.1 mb
+        requestDetails['body'] = req.body || {};
+    }
 
-    Logger.prepareInfoLog(id, { body: req.body, path: req.params, query: req.query, url: req.originalUrl, service }, "Incoming request");
+    Logger.prepareInfoLog(id, requestDetails, "Incoming request");
 
-    res.on('finish', function() {
+    res.on('finish', function () {
         const duration = Date.now() - start;
-        const status = res.status;
-        Logger.prepareInfoLog(id, { res, status, duration, service  }, "Outgoing request - finish event");
+        const status = res.statusCode;
+        Logger.prepareInfoLog(id, { status, duration, service, url: req.url, userId }, "Outgoing request - finish event");
     });
 
-    res.on('close', function() {
+    res.on('close', function () {
         const duration = Date.now() - start;
-        const status = res.status;
-        Logger.prepareInfoLog(id, { res, status, duration, service }, "Outgoing request - close event");
+        const status = res.statusCode;
+        Logger.prepareInfoLog(id, { status, duration, service, url: req.url, userId }, "Outgoing request - close event");
     });
     next();
 };

package/lib/notification.config.js

@@ -100,7 +100,7 @@ const config = {
         target: "group",
         path: "manage",
         title: "Group Invitation",
-        type: ["push"],
+        type: ["push", "drawer"],
         buttons: [],
         android_channel_id: notificationChannels.groups_manage_requests
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "playov2-js-utilities",
-  "version": "0.3.21",
+  "version": "0.3.24",
   "description": "Private package for JS utility functions",
   "main": "index.js",
   "scripts": {
@@ -17,6 +17,7 @@
   "license": "ISC",
   "homepage": "https://bitbucket.org/techmash/playov2-js-utilities#readme",
   "devDependencies": {
+    "@types/uuid": "^8.3.4",
     "faker": "^5.5.3",
     "jest": "^27.1.0"
   },