Merge pull request #1 from Moesif/companyIdFix

Feature parity with moesif-express

Author: dgilling

index.js

@@ -1,6 +1,6 @@
 /**
- * Created by derric on 8/23/17.
  * This file is an example AWS Lambda function.
+ * The Moesif AWS Lambda SDK is in the ./lib directory
  */
 
 const moesif = require('./lib');

lib/index.js

@@ -1,16 +1,13 @@
-/**
- * Created by derric on 8/22/17.
- */
 'use strict'
-var _ = require('lodash');
-var url = require('url');
-var moesifapi = require('moesifapi');
-var EventModel = moesifapi.EventModel;
-var requestIp = require('request-ip');
-var logData = {};
-logData.request = {};
-logData.response = {};
-logData.request.time = Date.now();
+const _ = require('lodash');
+const url = require('url');
+const moesifapi = require('moesifapi');
+const requestIp = require('request-ip');
+const moesifConfigManager = require('./moesifConfigManager');
+const EventModel = moesifapi.EventModel;
+const UserModel = moesifapi.UserModel;
+const CompanyModel = moesifapi.CompanyModel;
+var startTime = Date.now();
 
 //
 // ### function moesifExpress(options)
@@ -39,9 +36,19 @@ module.exports = function (options, handler) {
           (event.requestContext && event.requestContext.identity && event.requestContext.identity.user) ||
           event.user;
     };
+
+  options.identifyCompany = options.identifyCompany || function() {};
+
   options.getSessionToken = options.getSessionToken || function (event, context) {
-      return (event.requestContext && event.requestContext.identity && event.requestContext.identity.apiKey) ;
+      return (event.requestContext && event.requestContext.identity && event.requestContext.identity.apiKey);
     };
+  options.getMetadata = options.getMetadata || function (event, context) {
+    const metadata = {};
+    metadata.trace_id = context.awsRequestId;
+    metadata.function_name = context.functionName;
+    metadata.request_context = event && event.requestContext;
+    return metadata;
+  };
   options.getTags = options.getTags || function () {
       return undefined;
     };
@@ -58,29 +65,68 @@ module.exports = function (options, handler) {
       return false;
     };
 
+  var logBody = true;
+  if (typeof options.logBody !== 'undefined' && options.logBody !== null) {
+      logBody = Boolean(options.logBody);
+   }
+  options.logBody = logBody;
+
   ensureValidOptions(options);
 
   // config moesifapi
   var config = moesifapi.configuration;
-  config.ApplicationId = options.applicationId || process.env.MOESIF_APPLICATION_ID;
+  config.ApplicationId = options.applicationId || options.ApplicationId || process.env.MOESIF_APPLICATION_ID;
+  config.BaseUri = options.baseUri || options.BaseUri || config.BaseUri;
   var moesifController = moesifapi.ApiController;
 
   var moesifMiddleware = function (event, context, callback) {
     logMessage(options.debug, 'moesifMiddleware', 'start');
+    moesifConfigManager.tryGetConfig();
 
-      var next = function (err, result) {
-          logEvent(event, context, err, result, options, moesifController);
-          callback(err, result)
-      };
+    var next = function (err, result) {
+      logEvent(event, context, err, result, options, moesifController);
+      callback(err, result)
+    };
 
-      handler(event, context, next);
+    handler(event, context, next);
   };
 
-  moesifMiddleware.updateUser = function (userModel, cb) {
+  moesifMiddleware.updateUser = function(userModel, cb) {
+    const user = new UserModel(userModel);
     logMessage(options.debug, 'updateUser', 'userModel=' + JSON.stringify(userModel));
-    ensureValidUserModel(userModel);
+    ensureValidUserModel(user);
     logMessage(options.debug, 'updateUser', 'userModel valid');
-    moesifController.updateUser(userModel, cb);
+    moesifController.updateUser(user, cb);
+  };
+
+  moesifMiddleware.updateUsersBatch = function(usersBatchModel, cb) {
+    usersBatch = [];
+    for (let userModel of usersBatchModel) {
+      usersBatch.push(new UserModel(userModel));
+    }
+    logMessage(options.debug, 'updateUsersBatch', 'usersBatchModel=' + JSON.stringify(usersBatchModel));
+    ensureValidUsersBatchModel(usersBatch);
+    logMessage(options.debug, 'updateUsersBatch', 'usersBatchModel valid');
+    moesifController.updateUsersBatch(usersBatch, cb);
+  };
+
+  moesifMiddleware.updateCompany = function(companyModel, cb) {
+    const company = new CompanyModel(companyModel);
+    logMessage(options.debug, 'updateCompany', 'companyModel=' + JSON.stringify(companyModel));
+    ensureValidCompanyModel(company);
+    logMessage(options.debug, 'updateCompany', 'companyModel valid');
+    moesifController.updateCompany(company, cb);
+  }
+
+  moesifMiddleware.updateCompaniesBatch = function(companiesBatchModel, cb) {
+    companiesBatch = [];
+    for (let companyModel of companiesBatchModel) {
+      companiesBatch.push(new CompanyModel(companyModel));
+    }
+    logMessage(options.debug, 'updateCompaniesBatch', 'companiesBatchModel=' + JSON.stringify(companiesBatchModel));
+    ensureValidCompaniesBatchModel(companiesBatch);
+    logMessage(options.debug, 'updateCompaniesBatch', 'companiesBatchModel valid');
+    moesifController.updateCompaniesBatch(companiesBatch, cb);
   };
 
   logMessage(options.debug, 'moesifInitiator', 'returning moesifMiddleware Function');
@@ -89,10 +135,6 @@ module.exports = function (options, handler) {
 
 function mapResponseHeaders(event, context, result) {
     const headers = result.headers || {}; // NOTE: Mutating event.headers; prefer deep clone of event.headers
-
-    headers['x-amzn-trace-id'] = context.awsRequestId;
-    headers['x-amzn-function-name'] = context.functionName;
-    headers['x-apigateway-trace-id'] = (event && event.requestContext && event.requestContext.requestId) || (context && context.requestContext && context.requestContext.requestId);
     return headers;
 }
 
@@ -104,41 +146,45 @@ function logEvent(event, context, err, result, options, moesifController) {
       return;
   }
 
+  var logData = {};
+  logData.request = {};
+  logData.response = {};
+  logData.request.time = event && event.requestContext && event.requestContext.requestTimeEpoch ? 
+    new Date(event && event.requestContext && event.requestContext.requestTimeEpoch) : 
+    startTime;
+
   logData.request.uri = getPathWithQueryStringParams(event);
   logData.request.verb = event.httpMethod;
   logData.request.apiVerion = options.getApiVersion(event, context);
   logData.request.ipAddress = requestIp.getClientIp(event) || (event.requestContext && event.requestContext.identity && event.requestContext.identity.sourceIp);
   logData.request.headers = event.headers || {};
+  logData.metadata = options.getMetadata(event, context);
 
-  if (event.body) {
+  if (options.logBody && event.body) {
       if (event.isBase64Encoded) {
-          logData.request.transferEncoding = 'base64';
-          logData.request.body = bodyToBase64(event.body);
+        logData.request.body = event.body;
+        logData.request.transferEncoding = 'base64';
       } else {
-          try {
-              logData.request.body = JSON.parse(event.body);
-          } catch (err) {
-              logData.request.body = event.body;
-          }
+        const bodyWrapper = safeJsonParse(event.body);
+        logData.request.body = bodyWrapper.body
+        logData.request.transferEncoding = bodyWrapper.transferEncoding
       }
   }
 
   logMessage(options.debug, 'logEvent', 'created request: \n' + JSON.stringify(logData.request));
   var safeRes = result || {};
-  logData.response.time = Date.now();
+  logData.response.time = new Date(Math.max(logData.request.time.getTime(), Date.now()));
   logData.response.status = safeRes.statusCode ? parseInt(safeRes.statusCode) : 599;
   logData.response.headers = mapResponseHeaders(event, context, safeRes);
 
-  if (safeRes.body) {
+  if (options.logBody && safeRes.body) {
       if (safeRes.isBase64Encoded) {
-          logData.response.transferEncoding = 'base64';
-          logData.response.body = bodyToBase64(safeRes.body);
+        logData.response.body = safeRes.body;
+        logData.response.transferEncoding = 'base64';
       } else {
-          try {
-              logData.response.body = JSON.parse(safeRes.body);
-          } catch (err) {
-              logData.response.body = safeRes.body;
-          }
+        const bodyWrapper = safeJsonParse(safeRes.body);
+        logData.response.body = bodyWrapper.body
+        logData.response.transferEncoding = bodyWrapper.transferEncoding
       }
   }
 
@@ -147,6 +193,7 @@ function logEvent(event, context, err, result, options, moesifController) {
   logData = options.maskContent(logData);
 
   logData.userId = options.identifyUser(event, context);
+  logData.companyId = options.identifyCompany(event, context);
   logData.sessionToken = options.getSessionToken(event, context);
   logData.tags = options.getTags(event, context);
 
@@ -155,7 +202,7 @@ function logEvent(event, context, err, result, options, moesifController) {
   ensureValidLogData(logData);
 
   // This is fire and forget, we don't want logging to hold up the request so don't wait for the callback
-  if (!options.skip(event, context)) {
+  if (!options.skip(event, context) && moesifConfigManager.shouldSend(logData && logData.userId, logData && logData.companyId)) {
     logMessage(options.debug, 'logEvent', 'sending data invoking moesifAPI');
 
     moesifController.createEvent(new EventModel(logData), function(err) {
@@ -189,8 +236,48 @@ function bodyToBase64(body) {
   }
 }
 
+function safeJsonParse(body) {
+  try {
+    if (!Buffer.isBuffer(body) &&
+      (typeof body === 'object' || Array.isArray(body))) {
+      return {
+        body: body,
+        transferEncoding: undefined
+      }
+    }
+    return {
+      body: JSON.parse(body.toString()),
+      transferEncoding: undefined
+    }
+  } catch (e) {
+    return {
+      body: bodyToBase64(body),
+      transferEncoding: 'base64'
+    }
+  }
+}
+
+function bodyToBase64(body) {
+  if (!body) {
+    return body;
+  }
+  if (Buffer.isBuffer(body)) {
+    return body.toString('base64');
+  } else if (typeof body === 'string') {
+    return Buffer.from(body).toString('base64');
+  } else if (typeof body.toString === 'function') {
+    return Buffer.from(body.toString()).toString('base64');
+  } else {
+    return '';
+  }
+}
+
 function getPathWithQueryStringParams(event) {
-    return url.format({ pathname: event.path, query: event.queryStringParameters })
+  try {
+    return url.format({ pathname: event.path, query: event.queryStringParameters });
+  } catch (err) {
+    return '/';
+  }
 }
 
 function ensureValidOptions(options) {
@@ -199,14 +286,20 @@ function ensureValidOptions(options) {
   if (options.identifyUser && !_.isFunction(options.identifyUser)) {
     throw new Error('identifyUser should be a function');
   }
+  if (options.identifyCompany && !_.isFunction(options.identifyCompany)) {
+    throw new Error('identifyCompany should be a function');
+  }
   if (options.getSessionToken && !_.isFunction(options.getSessionToken)) {
     throw new Error('getSessionToken should be a function');
   }
+  if (options.getMetadata && !_.isFunction(options.getMetadata)) {
+    throw new Error('getMetadata should be a function');
+  }
   if (options.getTags && !_.isFunction(options.getTags)) {
     throw new Error('getTags should be a function');
   }
   if (options.getApiVersion && !_.isFunction(options.getApiVersion)) {
-    throw new Error('identifyUser should be a function');
+    throw new Error('getApiVersion should be a function');
   }
   if (options.maskContent && !_.isFunction(options.maskContent)) {
     throw new Error('maskContent should be a function');
@@ -235,17 +328,20 @@ function ensureValidLogData(logData) {
     throw new Error('For Moesif events, request and response objects are required. Please check your maskContent function do not remove this');
   }
   else {
-    // if (!logData.response.body) {
-    //   throw new Error('for log events, response body objects is required but can be empty object');
-    // }
     if (!logData.request.time) {
       throw new Error('For Moesif events, response time is required. The middleware should populate it automatically. Please check your maskContent function do not remove this');
     }
   }
 }
 
 function ensureValidUserModel(userModel) {
-  if (!userModel.userId) {
+  if (!userModel || !userModel.userId) {
     throw new Error('To update user, a userId field is required');
   }
 }
+
+function ensureValidCompanyModel(companyModel) {
+  if (!companyModel || !companyModel.companyId) {
+    throw new Error('To update company, a companyId field is required');
+  }
+}