review fixes

Author: rsachan8

src/authentication/logging/ExternalLoggerWrapper.js

@@ -8,7 +8,7 @@ class ExternalLoggerWrapper{
         this.extLogger = externalLogger;
     }
 
-    getExternalLogger(){
+    getLogger(){
         return this.extLogger;
     }
 

src/authentication/logging/LogConfiguration.js

@@ -3,6 +3,8 @@
 var Constants = require('../util/Constants');
 const ExternalLoggerWrapper = require('../logging/ExternalLoggerWrapper');
 const ApiException = require('../util/ApiException');
+const fs = require("fs");
+const path = require("path");
 
 class LogConfiguration {
     enableLog;
@@ -12,8 +14,8 @@ class LogConfiguration {
     loggingLevel;
     maxLogFiles;
     enableMasking;
+    hasExternalLogger;
     externalLogger;
-    externalLoggerObj;
 
     constructor(logConfig) {
         this.setLogEnable(logConfig.enableLog);
@@ -23,8 +25,8 @@ class LogConfiguration {
         this.setLoggingLevel(logConfig.loggingLevel);
         this.setMaxLogFiles(logConfig.maxLogFiles);
         this.setMaskingEnabled(logConfig.enableMasking);
+        this.setHasExternalLogger(logConfig.hasExternalLogger);
         this.setExternalLogger(logConfig.externalLogger);
-        this.setExternalLoggerObj(logConfig.externalLoggerObj);
     }
 
     isLogEnabled() {
@@ -49,20 +51,20 @@ class LogConfiguration {
         this.enableMasking = enableMaskingValue;
     }
 
-    setExternalLogger(externalLogger){
-        this.externalLogger = externalLogger;
+    setHasExternalLogger(hasExternalLogger){
+        this.hasExternalLogger = hasExternalLogger;
     }
 
     isExternalLoggerSet(){
-        return this.externalLogger;
+        return this.hasExternalLogger;
     }
 
-    setExternalLoggerObj(externalLoggerObj){
-        this.externalLoggerObj = externalLoggerObj;
+    setExternalLogger(externalLogger){
+        this.externalLogger = externalLogger;
     }
 
-    getExternalLoggerObj(){
-        return this.externalLoggerObj;
+    getExternalLogger(){
+        return this.externalLogger;
     }
 
     getLogDirectory () {
@@ -122,16 +124,16 @@ class LogConfiguration {
 
     getDefaultLoggingProperties(warningMessage) {
 
-        if(typeof (this.externalLogger) === "boolean" && this.externalLogger === true){
-            this.externalLogger = true;
+        if(typeof (this.hasExternalLogger) === "boolean" && this.hasExternalLogger === true){
+            this.hasExternalLogger = true;
         } else {
-            this.externalLogger = false;
+            this.hasExternalLogger = false;
         }
 
-        if(typeof (this.externalLoggerObj) === "Object" || !(this.externalLoggerObj instanceof ExternalLoggerWrapper)
-            && this.externalLoggerObj === undefined || !(this.externalLoggerObj.isLoggerEmpty())){
+        if((typeof (this.externalLogger) === "object" && !(this.externalLogger instanceof ExternalLoggerWrapper))
+            || this.externalLogger === undefined || !(this.externalLogger.isLoggerEmpty())){
             ApiException.LoggerException("No valid external logger object found. Turning off external logger flag.")
-            this.externalLogger = false;
+            this.hasExternalLogger = false;
         }
 
         if (typeof (this.enableLog) === "boolean" && this.enableLog === true) {

src/authentication/logging/Logger.js

@@ -15,9 +15,10 @@ const unmaskedLoggingFormat = printf(({ level, message, label, timestamp }) => {
 
 exports.getLogger = function (merchantConfig, loggerCategory = 'UnknownCategoryLogger') {
 
-  if(merchantConfig.getLogConfiguration().isExternalLoggerSet() && merchantConfig.getLogConfiguration().getExternalLoggerObj().getExternalLogger()
-      && merchantConfig.getLogConfiguration().getExternalLoggerObj() instanceof ExternalLoggerWrapper){
-    let logger = merchantConfig.getLogConfiguration().getExternalLoggerObj().getExternalLogger();
+  if(merchantConfig.getLogConfiguration().isExternalLoggerSet() && merchantConfig.getLogConfiguration().getExternalLogger()
+      && merchantConfig.getLogConfiguration().getExternalLogger().getLogger()
+      && merchantConfig.getLogConfiguration().getExternalLogger() instanceof ExternalLoggerWrapper){
+    let logger = merchantConfig.getLogConfiguration().getExternalLogger().getLogger();
     return logger;
   }
   var enableLog = merchantConfig.getLogConfiguration().isLogEnabled();
@@ -43,9 +44,9 @@ exports.getLogger = function (merchantConfig, loggerCategory = 'UnknownCategoryL
     newLogger = winston.loggers.get(loggerCategory + loggerCategoryRandomiser, {
       level: loggingLevel,
       format: combine(
-        label({ label: loggerCategory }),
-        timestamp(),
-        enableMasking ? maskedLoggingFormat : unmaskedLoggingFormat
+          label({ label: loggerCategory }),
+          timestamp(),
+          enableMasking ? maskedLoggingFormat : unmaskedLoggingFormat
       ),
       transports: [new winston.transports.Console({
         silent: !enableLog