apf-node-common 2.0.0 → 3.0.0

package/ApplicationContextService.js

@@ -1,5 +1,3 @@
-//const log = require('./Logger/index').getLogger();
-
 const sendResponse= require('./exception/SendResponse')
 var jwt = require('jsonwebtoken');
 const {UserType} = require('./constants/UserType');
@@ -10,17 +8,9 @@ exports.setContextAttributes = async (req, res,httpContext, next)=>{
      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;
 
@@ -75,6 +65,7 @@ exports.setContextAttributes = async (req, res,httpContext, next)=>{
 
         httpContext.set('username',payload.sub)
         httpContext.set('TimeZone',payload.TimeZone)
+        httpContext.set("IPAddress", req.ip)
 
         log.info(`username - ${httpContext.get('username')}`);
          next();
@@ -87,17 +78,3 @@ exports.setContextAttributes = async (req, res,httpContext, next)=>{
       }
     }
   }
-
-//   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/auditlog/AuditLogger.js

@@ -1,6 +1,6 @@
 const DATE_TIME_DB_FORMAT = "YYYY-MM-DD HH:mm:ss";
 const moment = require("moment");
-AuditLoggerService = require("./AuditLoggerService");
+const AuditLoggerService = require("./AuditLoggerService");
 
 class AuditLogger {
 
@@ -22,7 +22,6 @@ class AuditLogger {
         entityId = String(obj[key]);
         break;
       }
-
     }
     return entityId;
   }
@@ -31,29 +30,23 @@ class AuditLogger {
     return moment().utc().format(DATE_TIME_DB_FORMAT);
   }
 
-
   async audit(message, subject, messageAttributes) {
     try {
-
-
-
       const entityId = this.getPropertyValue(JSON.parse(message), "id");
       const currentTime = this.UTC();
-      const userName = (messageAttributes && messageAttributes.CurrentUserName) ? messageAttributes.CurrentUserName.Value : "system";
-      const ipaddress = (messageAttributes && messageAttributes.IPAddress) ? messageAttributes.IPAddress.Value : "255.255.255.255";
+      const userName = (messageAttributes && messageAttributes.CurrentUserName) ? messageAttributes.CurrentUserName.StringValue : "system";
+      const ipaddress = (messageAttributes && messageAttributes.IPAddress) ? messageAttributes.IPAddress.StringValue : "255.255.255.255";
       if (entityId === undefined) {
         return;
       }
+      
       console.log("Event Received : EntityId = " + entityId + ", Topic Name = " + subject +
         ", UserName = " + userName + ", IP Address = " + ipaddress);
 
-
       await this.auditLoggerService.addAuditLog(entityId, subject, message, userName, ipaddress, currentTime);
     } catch (error) {
       console.log(`AuditLogger - Logs Not Added due to Error : ${error}`);
     }
-
   }
-
 }
 module.exports = AuditLogger;

package/index.js

@@ -154,7 +154,8 @@ module.exports.AWSUsagePlanAndApiKey = {
 }
 
 module.exports.AccessInterceptor = {
-    authorize: AccessInterceptor.authorize
+    // authorize: AccessInterceptor.authorize,
+    authorizeWithOpenApiJson: AccessInterceptor.authorizeWithOpenApiJson
 }
 
 module.exports.HashIds = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "apf-node-common",
-    "version": "2.0.0",
+    "version": "3.0.0",
     "description": "",
     "main": "index.js",
     "scripts": {
@@ -21,7 +21,6 @@
         "moment": "^2.24.0",
         "moment-timezone": "^0.5.27",
         "path-to-regexp": "^6.1.0",
-        "swagger-jsdoc": "^3.4.0",
         "winston": "^3.2.1",
         "winston-aws-cloudwatch": "^3.0.0",
         "winston-daily-rotate-file": "^4.5.0"

package/utils/AccessInterceptor.js

@@ -1,16 +1,41 @@
-const swaggerJSDoc = require('swagger-jsdoc');
-//const swaggerDefinition = require('./controllers/swaggerDefinition')
-const { pathToRegexp, match, parse, compile } = require('path-to-regexp')
+const { pathToRegexp } = require('path-to-regexp');
+// const swaggerJSDoc = require('swagger-jsdoc');
 
-function authorize(req, res, options, httpContext, next) {
+// function authorize(req, res, options, httpContext, next) {
+//     console.log('AccessInterceptor -> authorize');
+//     /*var options = {
+//         swaggerDefinition: swaggerDefinition,
+//         apis: ['swagger/*.js']
+//     };*/
+
+//     const swaggerSpec = swaggerJSDoc(options)
+//     const swaggerJson = JSON.parse(JSON.stringify(swaggerSpec))
+//     try {
+//         const isAllowed = validateAccess(swaggerJson, req, httpContext, res);
+//         if (isAllowed === false) {
+//             return isAllowed
+//         }
+//         return true;
+
+//     } catch (error) {
+//         console.log(error);
+//         return error;
+//     }
+//     next();
+// }
+
+/**
+ * Authorize request based on swagger specification
+ * @param {Object} req - Express request object
+ * @param {Object} res - Express response object
+ * @param {Object} swaggerSpec - Pre-parsed swagger/OpenAPI specification JSON
+ * @param {Object} httpContext - HTTP context with user information
+ * @param {Function} next - Express next function
+ */
+function authorizeWithOpenApiJson(req, res, swaggerSpec, httpContext, next) {
     console.log('AccessInterceptor -> authorize');
-    /*var options = {
-        swaggerDefinition: swaggerDefinition,
-        apis: ['swagger/*.js']
-    };*/
 
-    const swaggerSpec = swaggerJSDoc(options)
-    const swaggerJson = JSON.parse(JSON.stringify(swaggerSpec))
+    const swaggerJson = typeof swaggerSpec === 'string' ? JSON.parse(swaggerSpec) : swaggerSpec;
     try {
         const isAllowed = validateAccess(swaggerJson, req, httpContext, res);
         if (isAllowed === false) {
@@ -86,4 +111,5 @@ function getReplacePath(path) {
     str = str.replace(/}/g, '');
     return str
 }
-exports.authorize = authorize;
+// exports.authorize = authorize;
+exports.authorizeWithOpenApiJson = authorizeWithOpenApiJson;

package/utils/aws/AWSSNSBasedEmailDispatcher.js

@@ -1,34 +1,27 @@
 const log = require('../../Logger').getLogger();
 const AWS = require('aws-sdk');
-
 const AWSSNSUtils = require('./AWSSNSUtils');
-const environment = (process.env.NODE_ENVIRONMENT || 'Test');
 const awsRegion = (process.env.AWS_DEFAULT_REGION || 'us-east-2');
-
 AWS.config.update({ region: awsRegion });
 const topicName = "Infrastructure-EmailHandler";
 const subject = 'Infrastructure-EmailHandler';
 
-var sns = new AWS.SNS();
+module.exports = {
 
-    module.exports = {
-
-    async  dispatchNotification(tagData, context) {
-        const messageAttributes =  getAttributs(context);
-        await AWSSNSUtils.publish(topicName, subject, JSON.stringify(tagData),messageAttributes);
+    async dispatchNotification(tagData, context) {
+        const messageAttributes = getAttributes(context);
+        await AWSSNSUtils.publish(topicName, subject, JSON.stringify(tagData), messageAttributes);
         log.info('email notification published!!')
-
     }
 }
 
-function getAttributs(context) {
+function getAttributes(context) {
     let messageAttributes = {};
-    context.forEach((contextValue) =>{
-             var value =  {
-                      DataType : "String",
-                      StringValue : contextValue.Value
-                    }   
-                    messageAttributes[contextValue.Key] = value;                          
+    context.forEach((contextValue) => {
+        messageAttributes[contextValue.Key] = {
+            DataType: "String",
+            StringValue: contextValue.Value
+        }
     });
 
     return messageAttributes;

package/utils/aws/AWSSNSUtils.js

@@ -1,45 +1,56 @@
 const log = require('../../Logger').getLogger();
 const AWS = require('aws-sdk');
-
 const environment = (process.env.NODE_ENVIRONMENT || 'Test');
 const awsRegion = (process.env.AWS_DEFAULT_REGION || 'us-east-2');
 const awsAccountNumber = (process.env.AWS_ACCOUNT_NUMBER);
 AWS.config.update({ region: awsRegion });
-AuditLogger = require("../../auditlog/AuditLogger");
-var sns = new AWS.SNS({apiVersion: '2010-03-31'});
+const AuditLogger = require("../../auditlog/AuditLogger");
+var sns = new AWS.SNS({ apiVersion: '2010-03-31' });
 
 module.exports = {
-    async publish(topic, subject, message,messageAttributes) {
-        try{
+    async publish(topic, subject, message, messageAttributes) {
+        try {
             let topicARN;
-            if(awsAccountNumber)
-            {
+            if (awsAccountNumber) {
                 topicARN = `arn:aws:sns:${awsRegion}:${awsAccountNumber}:${environment}-${topic}`;
             }
-            else
-            {
+            else {
                 log.info("Calling CreateTopic" + topicARN);
                 const topicName = `${environment}-${topic}`;
                 var response = await sns.createTopic({ Name: topicName }).promise();
                 topicARN = response.TopicArn;
             }
             log.info("Topic ARN is " + topicARN);
-            
+
+            let updatedMessageAttributes = getAttributes(messageAttributes);
+
             const snsParameters = {
                 Message: message,
-                MessageAttributes:messageAttributes,
+                MessageAttributes: updatedMessageAttributes,
                 Subject: subject,
                 TopicArn: topicARN
             };
-            
+
             var data = await sns.publish(snsParameters).promise();
 
-                log.info("MessageID is " + data.MessageId);
-                let auditLogger = new AuditLogger();
-                await auditLogger.audit(message, subject,messageAttributes);
-            }catch(error){
-                log.error(`error occured while publishing event ${subject} to SNS `)
-                log.error(error, error.stack);
-            }       
+            log.info("MessageID is " + data.MessageId);
+            let auditLogger = new AuditLogger();
+            await auditLogger.audit(message, subject, updatedMessageAttributes);
+        } catch (error) {
+            log.error(`error occured while publishing event ${subject} to SNS `)
+            log.error(error, error.stack);
+        }
     }
+}
+
+function getAttributes(context) {
+    let messageAttributes = {};
+    context.forEach((contextValue) => {
+        messageAttributes[contextValue.Key] = {
+            DataType: "String",
+            StringValue: contextValue.Value
+        }
+    });
+
+    return messageAttributes;
 }