Improves support authorizer.type == request (dherault#377)

Author: OrKoN

src/createAuthScheme.js

@@ -11,12 +11,16 @@ const _ = require('lodash');
 module.exports = function createAuthScheme(authFun, authorizerOptions, funName, endpointPath, options, serverlessLog, servicePath, serverless) {
   const authFunName = authorizerOptions.name;
 
-  const identitySourceMatch = /^method.request.header.((?:\w+-?)+\w+)$/.exec(authorizerOptions.identitySource);
-  if (!identitySourceMatch || identitySourceMatch.length !== 2) {
-    throw new Error(`Serverless Offline only supports retrieving tokens from the headers (λ: ${authFunName})`);
+  let identityHeader = 'authorization';
+
+  if (authorizerOptions.type !== 'request') {
+    const identitySourceMatch = /^method.request.header.((?:\w+-?)+\w+)$/.exec(authorizerOptions.identitySource);
+    if (!identitySourceMatch || identitySourceMatch.length !== 2) {
+      throw new Error(`Serverless Offline only supports retrieving tokens from the headers (λ: ${authFunName})`);
+    }
+    identityHeader = identitySourceMatch[1].toLowerCase();
   }
-
-  const identityHeader = identitySourceMatch[1].toLowerCase();
+  
   const funOptions = functionHelper.getFunctionOptions(authFun, funName, servicePath);
 
   // Create Auth Scheme
@@ -28,9 +32,6 @@ module.exports = function createAuthScheme(authFun, authorizerOptions, funName,
 
       // Get Authorization header
       const req = request.raw.req;
-      const authorization = req.headers[identityHeader];
-
-      debugLog(`Retrieved ${identityHeader} header ${authorization}`);
 
       // Get path params
       const pathParams = {};
@@ -49,12 +50,14 @@ module.exports = function createAuthScheme(authFun, authorizerOptions, funName,
           type: 'REQUEST',
           path: request.path,
           httpMethod: request.method.toUpperCase(),
-          headers: request.headers,
+          headers: Object.assign(request.headers, utils.capitalizeKeys(request.headers)),
           pathParameters: utils.nullIfEmpty(pathParams),
           queryStringParameters: utils.nullIfEmpty(request.query),
         };
       }
       else {
+        const authorization = req.headers[identityHeader];
+        debugLog(`Retrieved ${identityHeader} header ${authorization}`);
         event = {
           type: 'TOKEN',
           authorizationToken: authorization,

src/index.js

@@ -716,9 +716,9 @@ class Offline {
 
                 Object.assign(response.headers, defaultHeaders, result.headers);
                 if (!_.isUndefined(result.body)) {
-                  if(result.isBase64Encoded) {
+                  if (result.isBase64Encoded) {
                     response.encoding = 'binary';
-                    response.source = new Buffer(result.body,'base64');
+                    response.source = new Buffer(result.body, 'base64');
                     response.variety = 'buffer';
                   }
                   else {
@@ -874,8 +874,9 @@ class Offline {
     this.serverlessLog(message);
     if (stackTrace && stackTrace.length > 0) {
       console.log(stackTrace);
-    } else {
-      console.log(err)
+    }
+    else {
+      console.log(err);
     }
 
     /* eslint-disable no-param-reassign */