@apolitical/server 2.0.0-beta.2 → 2.0.0-beta.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apolitical/server",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "description": "Node.js module to encapsulate Apolitical's express server setup",
   "author": "Apolitical Group Limited <engineering@apolitical.co>",
   "license": "MIT",
@@ -24,7 +24,7 @@
     "Node Modules"
   ],
   "dependencies": {
-    "@apolitical/logger": "2.0.0-beta.6",
+    "@apolitical/logger": "2.0.0-beta.7",
     "@cloudnative/health-connect": "2.1.0",
     "awilix": "6.0.0",
     "body-parser": "1.19.1",

package/src/container.js

@@ -30,7 +30,6 @@ const serverError = require('./errors/server.error');
 const jwtDecodeHelper = require('./helpers/jwt/decode.helper');
 const jwtEncodeHelper = require('./helpers/jwt/encode.helper');
 const jwtPassportHelper = require('./helpers/jwt/passport.helper');
-const loggerHelper = require('./helpers/logger.helper');
 // Loaders
 const documentationLoader = require('./loaders/documentation.loader');
 const loggerLoader = require('./loaders/logger.loader');
@@ -79,7 +78,6 @@ container.register({
   jwtDecodeHelper: asFunction(jwtDecodeHelper).singleton(),
   jwtEncodeHelper: asFunction(jwtEncodeHelper).singleton(),
   jwtPassportHelper: asFunction(jwtPassportHelper).singleton(),
-  loggerHelper: asFunction(loggerHelper).singleton(),
   // Loaders
   documentationLoader: asFunction(documentationLoader).singleton(),
   loggerLoader: asFunction(loggerLoader).singleton(),

package/src/loaders/logger.loader.js

@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = ({ apoliticalLogger, morgan, config, logger, loggerHelper }) => {
+module.exports = ({ apoliticalLogger, morgan, config, logger }) => {
   const {
     LOGGED_OUT_SLUG,
     TOKENS: { USER_SLUG },
@@ -26,25 +26,14 @@ module.exports = ({ apoliticalLogger, morgan, config, logger, loggerHelper }) =>
     childLogger.debug('Started');
     // Setup Morgan with custom format and Apolitical Logger stream
     morgan.token(USER_SLUG, getUserSlug);
-    const morganMiddleware = morgan(
-      buildCustomFormat,
-      loggerHelper.build({
-        filename: __filename,
-        method: 'loggerMiddlewareMorgan',
-        labels,
-      }),
-    );
+    const morganMiddleware = morgan(buildCustomFormat, logger.where(__filename, 'morganMiddleware', labels));
     app.use(morganMiddleware);
     // Setup Google Cloud with Apolitical Logger
     if (config.NODE_ENV === 'production') {
-      const googleMiddleware = await apoliticalLogger.loggerMiddleware(
-        loggerHelper.build({
-          filename: __filename,
-          method: 'loggerMiddlewareWinston',
-          labels,
-        }),
+      const winstonMiddleware = await apoliticalLogger.loggerMiddleware(
+        logger.where(__filename, 'winstonMiddleware', labels),
       );
-      app.use(googleMiddleware);
+      app.use(winstonMiddleware);
     }
     childLogger.debug('Finished');
   };

package/src/middlewares/error.middleware.js

@@ -7,16 +7,11 @@ module.exports =
       JWT: { AUTH0 },
     },
     logger,
-    loggerHelper,
     serverError: { GeneralError },
   }) =>
   ({ labels, redirectURL }) => {
     // Apolitical Logger (with service metadata)
-    const errorLogger = loggerHelper.build({
-      filename: __filename,
-      method: 'errorMiddleware',
-      labels,
-    });
+    const errorLogger = logger.where(__filename, 'errorMiddleware', labels);
 
     // eslint-disable-next-line no-unused-vars
     return function handler(err, req, res, next) {

package/src/helpers/logger.helper.js

@@ -1,12 +0,0 @@
-'use strict';
-
-module.exports = ({ apoliticalLogger, config: { LOG_LEVEL } }) => ({
-  build({ filename, method, labels }) {
-    const options = { logLevel: LOG_LEVEL };
-    if (labels) {
-      Object.assign(options, { labels });
-    }
-    const logger = apoliticalLogger.createLogger(options);
-    return logger.where(filename, method);
-  },
-});