apf-node-common 1.0.107 → 1.0.110

package/ApplicationContextService.js

@@ -1,103 +1,103 @@
-//const log = require('./Logger/index').getLogger();
-
-const sendResponse= require('./exception/SendResponse')
-var jwt = require('jsonwebtoken');
-const {UserType} = require('./constants/UserType');
-
-exports.setContextAttributes = async (req, res,httpContext, next)=>{
-  const log = require('./index').Logger;
-    let  authToken=req.get('Authorization');
-     log.info('httpContext : ' + httpContext);
-
-    if (!authToken) {
-
-     // console.log('authToken ' + authToken);
-     // const result = sendResponse.unAuthorizedAccess(res);
-     // res.status(result.statuscode).send(result.response);
-     next();
-
-    } else {
-      try{
-
-       
-
-      authToken = authToken.replace('Bearer','').trim();
-       const payload = jwt.decode(authToken, {complete: true}).payload;
-
-       if (payload) {
-        log.info(JSON.stringify(payload));
-      
-        if (payload.Admin=='1' && (payload.UserType).toLowerCase()===UserType.GLOBAL) {
-          httpContext.set('IsGlobalAdmin',true);
-          httpContext.set('IsAdmin',true);
-
-          log.info(`Context - IsGlobalAdmin - ${httpContext.get('IsGlobalAdmin')}`);
-          log.info(`Context - IsAdmin - ${httpContext.get('IsAdmin')}`);
-
-        } else if ((payload.Admin==='1') && ((payload.UserType).toLowerCase()==UserType.MERCHANT)) {
-          httpContext.set('IsAdmin',true);
-          httpContext.set('IsMerchantAdmin',true);
-
-          log.info(`Context - IsMerchantAdmin - ${httpContext.get('IsMerchantAdmin')}`);
-          log.info(`Context - IsAdmin - ${httpContext.get('IsAdmin')}`);
-
-        } else if (payload.Admin==='1' && (payload.UserType).toLowerCase()===UserType.RESELLER) {
-          httpContext.set('IsResellerAdmin',true);
-          httpContext.set('IsAdmin',true);
-
-          log.info(`Context - IsResellerAdmin - ${httpContext.get('IsResellerAdmin')}`);
-          log.info(`Context - IsAdmin - ${httpContext.get('IsAdmin')}`);
-
-        } else if (payload.Admin==='1' && (payload.UserType).toLowerCase()===UserType.PARTNER) {
-          httpContext.set('IsPartnerAdmin',true);
-          httpContext.set('IsAdmin',true);
-
-          log.info(`Context - IsPartnerAdmin - ${httpContext.get('IsPartnerAdmin')}`);
-          log.info(`Context - IsAdmin - ${httpContext.get('IsAdmin')}`);
-
-        }else if(payload.Admin==='1' && (payload.UserType).toLowerCase() === UserType.CUSTOMER){
-          httpContext.set('IsAdmin',true);
-          httpContext.set('CustomerUserName',payload.Id);
-          
-          log.info(`Context - IsAdmin - ${httpContext.get('IsAdmin')}`);
-        }else if (payload.Admin==='0'){
-          httpContext.set('IsAdmin',false);
-          log.info(`Context - UserType - ${payload.UserType}`);
-          log.info(`Context - IsAdmin - ${httpContext.get('IsAdmin')}`);
-        }
-        httpContext.set('ParentId',payload.ParentId)
-        httpContext.set('ResellerId',payload.ResellerId)
-        httpContext.set('PartnerId',payload.PartnerId)
-        httpContext.set('MerchantId',payload.MerchantId)
-        httpContext.set('CustomerId',payload.CustomerId)
-        httpContext.set('UserType', payload.UserType)
-        httpContext.set('Admin', payload.Admin)
-
-        httpContext.set('username',payload.sub)
-        httpContext.set('TimeZone',payload.TimeZone)
-
-        log.info(`username - ${httpContext.get('username')}`);
-         next();
-       } else {
-        return sendResponse.unAuthorizedAccess(res);
-       }
-      }catch(error){
-        const result = sendResponse.unAuthorizedAccess(res);
-        res.status(result.statuscode).send(result.response);
-      }
-    }
-  }
-
-//   function userMiddleware (req, res, next) {
-//     getUserViaJWT(req.headers.authentication)
-//     .then(function(user) {
-//       req.user = user
-//       next()
-//     })
-//     .catch(function (error) {
-//       res.status(401).end() //replace with proper error handling
-//     })
-//   }
-//   app.use(userMiddleware)
-
-
+//const log = require('./Logger/index').getLogger();
+
+const sendResponse= require('./exception/SendResponse')
+var jwt = require('jsonwebtoken');
+const {UserType} = require('./constants/UserType');
+
+exports.setContextAttributes = async (req, res,httpContext, next)=>{
+  const log = require('./index').Logger;
+    let  authToken=req.get('Authorization');
+     log.info('httpContext : ' + httpContext);
+
+    if (!authToken) {
+
+     // console.log('authToken ' + authToken);
+     // const result = sendResponse.unAuthorizedAccess(res);
+     // res.status(result.statuscode).send(result.response);
+     next();
+
+    } else {
+      try{
+
+       
+
+      authToken = authToken.replace('Bearer','').trim();
+       const payload = jwt.decode(authToken, {complete: true}).payload;
+
+       if (payload) {
+        log.info(JSON.stringify(payload));
+      
+        if (payload.Admin=='1' && (payload.UserType).toLowerCase()===UserType.GLOBAL) {
+          httpContext.set('IsGlobalAdmin',true);
+          httpContext.set('IsAdmin',true);
+
+          log.info(`Context - IsGlobalAdmin - ${httpContext.get('IsGlobalAdmin')}`);
+          log.info(`Context - IsAdmin - ${httpContext.get('IsAdmin')}`);
+
+        } else if ((payload.Admin==='1') && ((payload.UserType).toLowerCase()==UserType.MERCHANT)) {
+          httpContext.set('IsAdmin',true);
+          httpContext.set('IsMerchantAdmin',true);
+
+          log.info(`Context - IsMerchantAdmin - ${httpContext.get('IsMerchantAdmin')}`);
+          log.info(`Context - IsAdmin - ${httpContext.get('IsAdmin')}`);
+
+        } else if (payload.Admin==='1' && (payload.UserType).toLowerCase()===UserType.RESELLER) {
+          httpContext.set('IsResellerAdmin',true);
+          httpContext.set('IsAdmin',true);
+
+          log.info(`Context - IsResellerAdmin - ${httpContext.get('IsResellerAdmin')}`);
+          log.info(`Context - IsAdmin - ${httpContext.get('IsAdmin')}`);
+
+        } else if (payload.Admin==='1' && (payload.UserType).toLowerCase()===UserType.PARTNER) {
+          httpContext.set('IsPartnerAdmin',true);
+          httpContext.set('IsAdmin',true);
+
+          log.info(`Context - IsPartnerAdmin - ${httpContext.get('IsPartnerAdmin')}`);
+          log.info(`Context - IsAdmin - ${httpContext.get('IsAdmin')}`);
+
+        }else if(payload.Admin==='1' && (payload.UserType).toLowerCase() === UserType.CUSTOMER){
+          httpContext.set('IsAdmin',true);
+          httpContext.set('CustomerUserName',payload.Id);
+          
+          log.info(`Context - IsAdmin - ${httpContext.get('IsAdmin')}`);
+        }else if (payload.Admin==='0'){
+          httpContext.set('IsAdmin',false);
+          log.info(`Context - UserType - ${payload.UserType}`);
+          log.info(`Context - IsAdmin - ${httpContext.get('IsAdmin')}`);
+        }
+        httpContext.set('ParentId',payload.ParentId)
+        httpContext.set('ResellerId',payload.ResellerId)
+        httpContext.set('PartnerId',payload.PartnerId)
+        httpContext.set('MerchantId',payload.MerchantId)
+        httpContext.set('CustomerId',payload.CustomerId)
+        httpContext.set('UserType', payload.UserType)
+        httpContext.set('Admin', payload.Admin)
+
+        httpContext.set('username',payload.sub)
+        httpContext.set('TimeZone',payload.TimeZone)
+
+        log.info(`username - ${httpContext.get('username')}`);
+         next();
+       } else {
+        return sendResponse.unAuthorizedAccess(res);
+       }
+      }catch(error){
+        const result = sendResponse.unAuthorizedAccess(res);
+        res.status(result.statuscode).send(result.response);
+      }
+    }
+  }
+
+//   function userMiddleware (req, res, next) {
+//     getUserViaJWT(req.headers.authentication)
+//     .then(function(user) {
+//       req.user = user
+//       next()
+//     })
+//     .catch(function (error) {
+//       res.status(401).end() //replace with proper error handling
+//     })
+//   }
+//   app.use(userMiddleware)
+
+

package/CoreUtils.js

@@ -1,60 +1,60 @@
-const moment = require("moment");
-const momentTz = require('moment-timezone');
-const timeZoneConvertor = require('./utils/TimeZoneConverter');
-const EnumHelper = require('./utils/enumHelper')
-const TimeZone = require('./constants/TimeZone')
-const DATE_TIME_DB_FORMAT = 'YYYY-MM-DD HH:mm:ss';
-
-
-convertUCfirst = (string) => {
-    return string.charAt(0).toUpperCase() + string.slice(1);
-}
-
-//handles upto 10 digit number
-prefixPad = (num, size) => {
-    return ('000000000' + num).substr(-size);
-}
-
-//supported date 2020-05-05T00:36:55.000Z
-getUTCDate = (dateValue, timezone) => {
-
-    let dateWithoutTimezone = moment(dateValue, "MM-DD-YYYY HH:mm:ss").format("YYYY-MM-DD HH:mm:ss");
-    var formattedDate = momentTz.tz(dateWithoutTimezone, EnumHelper.getEnumByValue(TimeZone, timezone));
-    var utcDate = formattedDate.utc().format(DATE_TIME_DB_FORMAT);
-    return utcDate;
-}
-
-isISOFormat = (inputDate) => {
-    var ISO_8601_FULL = /^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(\.\d+)?(([+-]\d\d:\d\d)|Z)?$/i
-    return ISO_8601_FULL.test(inputDate);
-}
-isInputDateTime = (inputDate) => {
-    var INPUT_DATE = /^([0]{0,1}[1-9]|1[012])-([1-9]|([012][0-9])|(3[01]))-\d\d\d\d (20|21|22|23|[0-1]?\d):[0-5]?\d:[0-5]?\d$/;
-    return INPUT_DATE.test(inputDate);
-}
-
-isInputDate = (inputDate) => {
-    var INPUT_DATE = /^([0]{0,1}[1-9]|1[012])-([1-9]|([012][0-9])|(3[01]))-\d\d\d\d$/;
-    return INPUT_DATE.test(inputDate);
-}
-
-
-formatSearchToDate = (timezone, toDate) => {
-    let toMerchantTimeZone = timeZoneConvertor.timeZoneConvert(parseInt(timezone), moment(toDate).utc(true));
-    let endDay = moment(toMerchantTimeZone).endOf('day').format(DATE_TIME_DB_FORMAT);
-    
-    var formattedDate = momentTz.tz(endDay, EnumHelper.getEnumByValue(TimeZone, timezone));
-    var utcDate = formattedDate.utc().format(DATE_TIME_DB_FORMAT);
-    return utcDate;
-}
-
-
-module.exports = {
-    convertUCfirst: convertUCfirst,
-    prefixPad: prefixPad,
-    getUTCDate: getUTCDate,
-    isISOFormat: isISOFormat,
-    isInputDateTime: isInputDateTime,
-    isInputDate: isInputDate,
-    formatSearchToDate: formatSearchToDate
+const moment = require("moment");
+const momentTz = require('moment-timezone');
+const timeZoneConvertor = require('./utils/TimeZoneConverter');
+const EnumHelper = require('./utils/enumHelper')
+const TimeZone = require('./constants/TimeZone')
+const DATE_TIME_DB_FORMAT = 'YYYY-MM-DD HH:mm:ss';
+
+
+convertUCfirst = (string) => {
+    return string.charAt(0).toUpperCase() + string.slice(1);
+}
+
+//handles upto 10 digit number
+prefixPad = (num, size) => {
+    return ('000000000' + num).substr(-size);
+}
+
+//supported date 2020-05-05T00:36:55.000Z
+getUTCDate = (dateValue, timezone) => {
+
+    let dateWithoutTimezone = moment(dateValue, "MM-DD-YYYY HH:mm:ss").format("YYYY-MM-DD HH:mm:ss");
+    var formattedDate = momentTz.tz(dateWithoutTimezone, EnumHelper.getEnumByValue(TimeZone, timezone));
+    var utcDate = formattedDate.utc().format(DATE_TIME_DB_FORMAT);
+    return utcDate;
+}
+
+isISOFormat = (inputDate) => {
+    var ISO_8601_FULL = /^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\d(\.\d+)?(([+-]\d\d:\d\d)|Z)?$/i
+    return ISO_8601_FULL.test(inputDate);
+}
+isInputDateTime = (inputDate) => {
+    var INPUT_DATE = /^([0]{0,1}[1-9]|1[012])-([1-9]|([012][0-9])|(3[01]))-\d\d\d\d (20|21|22|23|[0-1]?\d):[0-5]?\d:[0-5]?\d$/;
+    return INPUT_DATE.test(inputDate);
+}
+
+isInputDate = (inputDate) => {
+    var INPUT_DATE = /^([0]{0,1}[1-9]|1[012])-([1-9]|([012][0-9])|(3[01]))-\d\d\d\d$/;
+    return INPUT_DATE.test(inputDate);
+}
+
+
+formatSearchToDate = (timezone, toDate) => {
+    let toMerchantTimeZone = timeZoneConvertor.timeZoneConvert(parseInt(timezone), moment(toDate).utc(true));
+    let endDay = moment(toMerchantTimeZone).endOf('day').format(DATE_TIME_DB_FORMAT);
+    
+    var formattedDate = momentTz.tz(endDay, EnumHelper.getEnumByValue(TimeZone, timezone));
+    var utcDate = formattedDate.utc().format(DATE_TIME_DB_FORMAT);
+    return utcDate;
+}
+
+
+module.exports = {
+    convertUCfirst: convertUCfirst,
+    prefixPad: prefixPad,
+    getUTCDate: getUTCDate,
+    isISOFormat: isISOFormat,
+    isInputDateTime: isInputDateTime,
+    isInputDate: isInputDate,
+    formatSearchToDate: formatSearchToDate
 }

package/Logger/index.js

@@ -1,94 +1,94 @@
-'use strict'
-
-const winstonAwsCloudWatch = require('winston-aws-cloudwatch');
-const winston = require('winston');
-const config = require('./loggerTransports');
-
-class Logger {
-
-    getLogger(module) {
-        const logType = process.env.LOG_TYPE || 'console';
-        const level = process.env.LOG_LEVEL || "info";
-        let logger;
-        console.log(logType);
-        switch (logType) {
-            case 'off':
-                console.log('Logging is off');
-                logger = winston.createLogger(config.offTransport());
-                logger.cli();
-                break;
-
-            case 'console':
-                console.log('***********Logging to console***********');
-                logger = winston.createLogger(config.consoleTransport());
-                logger.format = winston.format.combine(winston.format.colorize(), winston.format.simple())
-                break;
-
-
-            case 'aws':
-                console.log('***********Logging to aws****************');
-                logger = winston.createLogger(config.awsTransport(module));
-                break;
-
-            case 'file':
-                console.log('***********Logging to file****************');
-                logger = winston.createLogger(config.fileTransport());
-                break;
-
-            default:
-                console.log('***********Default chosen:Logging to console***********');
-                logger = (config.consoleTransport());
-                logger.cli();
-                break;
-
-        }
-        logger.level = level;
-        logger.format = this.getRequestLogFormatter();
-        // Call exceptions.handle with a transport to handle exceptions
-        // logger.exceptions.handle(
-        //     new winston.transports.File({ filename: 'exceptions.log' })
-        // );
-
-      /*  const DailyRotateFile = require('winston-daily-rotate-file');
-        logger.configure({
-            level: 'verbose',
-            transports: [
-             new DailyRotateFile(opts)
-            ]
-        });*/
-        logger.exitOnError = false; //winston will not exit after logging an uncaughtException
-        return logger;
-    }
-
-    getRequestLogFormatter() {
-        const { combine, timestamp, printf } = winston.format;
-
-        return combine(
-            timestamp({
-                format: 'YYYY-MM-DD HH:mm:ss'
-            }),
-            // [${info.label}] winston.format.label({ label: path.basename(process.mainModule.filename) }),  
-            winston.format.printf(info => `${info.timestamp} ${info.level}  : ${info.message}`)
-
-        );
-    }
-
-
-    logError(err, req, res, next) {
-        logger.error(err)
-        next();
-    }
-
-    logRequest(req, res, next, log) {
-        log.info('hello');
-        next();
-    }
-
-    getLog() {
-        return this.logger;
-    }
-
-
-
-}
+'use strict'
+
+const winstonAwsCloudWatch = require('winston-aws-cloudwatch');
+const winston = require('winston');
+const config = require('./loggerTransports');
+
+class Logger {
+
+    getLogger(module) {
+        const logType = process.env.LOG_TYPE || 'console';
+        const level = process.env.LOG_LEVEL || "info";
+        let logger;
+        console.log(logType);
+        switch (logType) {
+            case 'off':
+                console.log('Logging is off');
+                logger = winston.createLogger(config.offTransport());
+                logger.cli();
+                break;
+
+            case 'console':
+                console.log('***********Logging to console***********');
+                logger = winston.createLogger(config.consoleTransport());
+                logger.format = winston.format.combine(winston.format.colorize(), winston.format.simple())
+                break;
+
+
+            case 'aws':
+                console.log('***********Logging to aws****************');
+                logger = winston.createLogger(config.awsTransport(module));
+                break;
+
+            case 'file':
+                console.log('***********Logging to file****************');
+                logger = winston.createLogger(config.fileTransport());
+                break;
+
+            default:
+                console.log('***********Default chosen:Logging to console***********');
+                logger = (config.consoleTransport());
+                logger.cli();
+                break;
+
+        }
+        logger.level = level;
+        logger.format = this.getRequestLogFormatter();
+        // Call exceptions.handle with a transport to handle exceptions
+        // logger.exceptions.handle(
+        //     new winston.transports.File({ filename: 'exceptions.log' })
+        // );
+
+      /*  const DailyRotateFile = require('winston-daily-rotate-file');
+        logger.configure({
+            level: 'verbose',
+            transports: [
+             new DailyRotateFile(opts)
+            ]
+        });*/
+        logger.exitOnError = false; //winston will not exit after logging an uncaughtException
+        return logger;
+    }
+
+    getRequestLogFormatter() {
+        const { combine, timestamp, printf } = winston.format;
+
+        return combine(
+            timestamp({
+                format: 'YYYY-MM-DD HH:mm:ss'
+            }),
+            // [${info.label}] winston.format.label({ label: path.basename(process.mainModule.filename) }),  
+            winston.format.printf(info => `${info.timestamp} ${info.level}  : ${info.message}`)
+
+        );
+    }
+
+
+    logError(err, req, res, next) {
+        logger.error(err)
+        next();
+    }
+
+    logRequest(req, res, next, log) {
+        log.info('hello');
+        next();
+    }
+
+    getLog() {
+        return this.logger;
+    }
+
+
+
+}
 module.exports = new Logger;