@apolitical/server 3.0.0-beta.0 → 3.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apolitical/server",
-  "version": "3.0.0-beta.0",
+  "version": "3.0.0-beta.2",
   "description": "Node.js module to encapsulate Apolitical's express server setup",
   "author": "Apolitical Group Limited <engineering@apolitical.co>",
   "license": "MIT",

package/src/config.js

@@ -3,6 +3,7 @@
 const { NODE_ENV, LOG_LEVEL } = process.env;
 
 const NAME = 'apolitical-server';
+const UUID = '812c9f40-af4b-4718-b41d-54c8a81e148d';
 const VERSION = '2.6.0';
 const ADMIN_ROLE = 'administrator';
 
@@ -53,9 +54,9 @@ module.exports = {
       },
     },
     MORGAN_OPTIONS: {
-      LOGGED_OUT_SLUG: 'logged-out',
+      LOGGED_OUT_ID: 'logged-out',
       TOKENS: {
-        USER_SLUG: 'user-slug',
+        USER_ID: 'user-id',
       },
     },
     CACHE_OPTIONS: {
@@ -105,7 +106,7 @@ module.exports = {
       DEFAULT_PAYLOAD: {
         role: ADMIN_ROLE,
         admin: true,
-        slug: NAME,
+        id: UUID,
         iss: NAME,
         sub: 'login',
       },

package/src/helpers/logger.helper.js

@@ -2,12 +2,12 @@
 
 module.exports = ({ morgan, config, logger }) => {
   const {
-    LOGGED_OUT_SLUG,
-    TOKENS: { USER_SLUG },
+    LOGGED_OUT_ID,
+    TOKENS: { USER_ID },
   } = config.SERVER.MORGAN_OPTIONS;
 
-  function getUserSlug(req) {
-    return req.user && req.user.slug ? req.user.slug : LOGGED_OUT_SLUG;
+  function getUserId(req) {
+    return req.user && req.user.id ? req.user.id : LOGGED_OUT_ID;
   }
 
   function buildCustomFormat(tokens, req, res) {
@@ -15,7 +15,7 @@ module.exports = ({ morgan, config, logger }) => {
       tokens.method(req, res),
       tokens.url(req, res),
       tokens.status(req, res),
-      tokens[USER_SLUG](req),
+      tokens[USER_ID](req),
       tokens['response-time'](req, res),
       'ms',
     ].join(' ');
@@ -23,10 +23,10 @@ module.exports = ({ morgan, config, logger }) => {
 
   function buildMiddleware(labels) {
     // Setup Morgan with custom format and Apolitical Logger stream
-    morgan.token(USER_SLUG, getUserSlug);
+    morgan.token(USER_ID, getUserId);
     const morganMiddleware = morgan(buildCustomFormat, logger.where(__filename, 'morganMiddleware', labels));
     return morganMiddleware;
   }
 
-  return { getUserSlug, buildMiddleware };
+  return { getUserId, buildMiddleware };
 };

package/src/middlewares/error.middleware.js

@@ -7,7 +7,7 @@ module.exports =
       JWT: { AUTH0 },
     },
     logger,
-    loggerHelper: { getUserSlug },
+    loggerHelper: { getUserId },
     serverError: { GeneralError },
   }) =>
   ({ labels, redirectURL, fallbackController }) => {
@@ -35,12 +35,12 @@ module.exports =
         }
       }
       // Log the error with all the relevent info
-      const userSlug = getUserSlug(req);
+      const userId = getUserId(req);
       if (req.log) {
-        req.log.warn(message, { errors, userSlug });
+        req.log.warn(message, { errors, userId });
       } else {
         const errorLogger = logger.where(__filename, 'handler', labels);
-        errorLogger.warn(message, { errors, userSlug });
+        errorLogger.warn(message, { errors, userId });
       }
       // Use the redirect URL to redirect the request
       if (redirectURL) {