Fix usage

Author: thenikso

index.js

@@ -1,45 +1,56 @@
 'use strict';
 
 const getObjectPath = require('./lib/utils').getObjectPath;
-const executeLambdaCallback = require('./lib/lambda-callback').executeLambdaCallback;
-const authorizerValidationCallback = require('./lib/authorizer-callback').authorizerValidationCallback;
-const authorizerCheckCallback = require('./lib/authorizer-callback').authorizerCheckCallback;
-const decorateLambdaReqCallback = require('./lib/decorators-callback').decorateLambdaReqCallback;
-const decorateAddCORSCallback = require('./lib/decorators-callback').decorateAddCORSCallback;
+const executeLambdaCallback = require('./lib/lambda-callbacks').executeLambdaCallback;
+const authorizerValidationCallback = require('./lib/authorizer-callbacks').authorizerValidationCallback;
+const authorizerCheckCallback = require('./lib/authorizer-callbacks').authorizerCheckCallback;
+const decorateLambdaReqCallback = require('./lib/decorators-callbacks').decorateLambdaReqCallback;
+const decorateAddCORSCallback = require('./lib/decorators-callbacks').decorateAddCORSCallback;
 
-module.exports = ({ html, authorizers }) => (slsConf, slsHandlers) => {
-  for (let funcId in slsConf.functions) {
-    const funcConf = slsConf.functions[funcId];
-    let func = getObjectPath(funcConf.handler, slsHandlers);
-    const events = (funcConf.events || []).map(e => e.http).filter(e => !!e);
-    for (let e of events) {
-      const authSource = getObjectPath(['authorizer', 'identitySource'], e);
-      const authValidatorExp = getObjectPath(['authorizer', 'identityValidationExpression'], e);
-      const authorizerFunction = (
-        getObjectPath(getObjectPath(['authorizer', 'arn'], e) || '', authorizers) ||
-        getObjectPath(getObjectPath(['authorizer', 'name'], e) || '', slsHandlers)
-      );
-      html(
-        e.method.toLowerCase(),
-        `/${e.path.replace(/\{(.+?)\}/g, ':$1')}`,
-        [
-          decorateLambdaReqCallback(),
-          ...(authorizerFunction ? [
-            authorizerValidationCallback(
-              authSource,
-              authValidatorExp ? new RegExp(authValidatorExp) : null,
-              {
-                regionId: 'express',
-                accountId: 'serverlessify',
-                apiId: `${slsConf.service}-${funcId}`,
-              }
-            ),
-            authorizerCheckCallback(authorizerFunction)
-          ] : []),
-          ...(e.cors ? [decorateAddCORSCallback()] : []),
-          executeLambdaCallback(func),
-        ]
-      )
+// Options:
+// - `html`
+// - `authorizers`
+// - `setCacheEntry`
+// - `getCacheEntry`
+module.exports = function(options) {
+  return function(slsConf, slsHandlers) {
+    for (let funcId in slsConf.functions) {
+      const funcConf = slsConf.functions[funcId];
+      let func = getObjectPath(funcConf.handler, slsHandlers);
+      const events = (funcConf.events || []).map(e => e.http).filter(e => !!e);
+      for (let e of events) {
+        const authSource = getObjectPath(['authorizer', 'identitySource'], e);
+        const authValidatorExp = getObjectPath(['authorizer', 'identityValidationExpression'], e);
+        const authorizerFunction = (
+          getObjectPath(getObjectPath(['authorizer', 'arn'], e) || '', options.authorizers) ||
+          getObjectPath(getObjectPath(['authorizer', 'name'], e) || '', slsHandlers)
+        );
+        options.html(
+          e.method.toLowerCase(),
+          `/${e.path.replace(/\{(.+?)\}/g, ':$1')}`,
+          [
+            decorateLambdaReqCallback(),
+            ...(authorizerFunction ? [
+              authorizerValidationCallback(
+                authSource,
+                authValidatorExp ? new RegExp(authValidatorExp) : null,
+                {
+                  regionId: 'express',
+                  accountId: 'serverlessify',
+                  apiId: `${slsConf.service}-${funcId}`,
+                }
+              ),
+              authorizerCheckCallback(
+                authorizerFunction,
+                options.setCacheEntry,
+                options.getCacheEntry
+              )
+            ] : []),
+            ...(e.cors ? [decorateAddCORSCallback()] : []),
+            executeLambdaCallback(func),
+          ]
+        )
+      }
     }
-  }
+  };
 };

lib/authorizer-callbacks.js

@@ -2,14 +2,14 @@
 
 const getObjectPath = require('./utils').getObjectPath;
 
+// arnOptions:
+// - `regionId`
+// - `accountId`
+// - `apiId`
 module.exports.authorizerValidationCallback = function(
   identitySource,
   identityValidationRegExp,
-  {
-    regionId,
-    accountId,
-    apiId,
-  }
+  arnOptions
 ) {
   return function(req, res, next) {
     const sources = {
@@ -34,7 +34,7 @@ module.exports.authorizerValidationCallback = function(
       event: {
         type: 'TOKEN',
         authorizationToken: source,
-        methodArn: `arn:serverlessify:execute-api:${regionId}:${accountId}:${apiId}/${method}${resourcePath}`,
+        methodArn: `arn:serverlessify:execute-api:${arnOptions.regionId}:${arnOptions.accountId}:${arnOptions.apiId}/${method}${resourcePath}`,
       },
     };
     next();
@@ -91,7 +91,7 @@ module.exports.authorizerCheckCallback = function(
     }
 
     const cacheKey = req.lambda.authorizer.event.authorizationToken;
-    getCacheEntry(
+    (getCacheEntry || function(i, cb) { cb() })(
       cacheKey,
       function(err, cachedAuthorization) {
         if (cachedAuthorization) {
@@ -101,7 +101,7 @@ module.exports.authorizerCheckCallback = function(
             req.lambda.authorizer.event,
             req.lambda.context,
             function(innerErr, awsAuthDocument) {
-              setCacheEntry({
+              (setCacheEntry || function(i, cb) { cb() })({
                 key: cacheKey,
                 value: awsAuthDocument,
               }, function() {