support update and identify company.

Author: xinghengwang

lib/index.js

@@ -39,6 +39,9 @@ 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) ;
     };
@@ -68,12 +71,12 @@ module.exports = function (options, handler) {
   var moesifMiddleware = function (event, context, callback) {
     logMessage(options.debug, 'moesifMiddleware', 'start');
 
-      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) {
@@ -83,6 +86,13 @@ module.exports = function (options, handler) {
     moesifController.updateUser(userModel, cb);
   };
 
+  moesifMiddleware.updateCompany = function (companyModel, cb) {
+    logMessage(options.debug, 'updateCompany', 'companyModel=' + JSON.stringify(companyModel));
+    ensureValidCompanyModel(companyModel);
+    logMessage(options.debug, 'updateCompany', 'companyModel valid');
+    moesifController.updateCompany(companyModel, cb);
+  };
+
   logMessage(options.debug, 'moesifInitiator', 'returning moesifMiddleware Function');
   return moesifMiddleware;
 };
@@ -131,13 +141,16 @@ function logEvent(event, context, err, result, options, moesifController) {
 
   if (safeRes.body) {
       if (safeRes.isBase64Encoded) {
+          // does this flag exists from AWS?
           logData.response.transferEncoding = 'base64';
           logData.response.body = bodyToBase64(safeRes.body);
       } else {
           try {
               logData.response.body = JSON.parse(safeRes.body);
           } catch (err) {
-              logData.response.body = safeRes.body;
+              // if JSON decode fails, we'll try to base64 encode the body.
+              logData.response.transferEncoding = 'base64';
+              logData.response.body = bodyToBase64(safeRes.body);
           }
       }
   }
@@ -147,6 +160,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);
 
@@ -245,7 +259,13 @@ function ensureValidLogData(logData) {
 }
 
 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');
+  }
+}

package.json

@@ -32,7 +32,7 @@
   "dependencies": {
     "debug": "^3.1.0",
     "lodash": "^4.16.4",
-    "moesifapi": "^1.3.2",
+    "moesifapi": "^2.0.2",
     "request-ip": "^2.1.1",
     "string": "^3.1.1"
   },