Finilize authorizers enablement

Author: vlewin

lib/deploy/events/apiGateway/authorizers.js

@@ -6,11 +6,7 @@ const awsArnRegExs = require('../../../utils/arnRegularExpressions');
 
 module.exports = {
   compileAuthorizers() {
-    console.log("*** compileAuthorizers")
     this.pluginhttpValidated.events.forEach((event) => {
-      console.log(event)
-
-
       if (event.http.authorizer && event.http.authorizer.arn) {
         const authorizer = event.http.authorizer;
         const authorizerProperties = {

lib/deploy/events/apiGateway/methods.js

@@ -4,7 +4,6 @@ const BbPromise = require('bluebird');
 const _ = require('lodash');
 const awsArnRegExs = require('../../../utils/arnRegularExpressions');
 
-
 module.exports = {
 
   compileMethods() {
@@ -19,7 +18,7 @@ module.exports = {
         Properties: {
           HttpMethod: event.http.method.toUpperCase(),
           RequestParameters: {},
-          AuthorizationType: 'CUSTOM',
+          AuthorizationType: 'NONE',
           ApiKeyRequired: Boolean(event.http.private),
           ResourceId: resourceId,
           RestApiId: this.provider.getApiGatewayRestApiId(),
@@ -184,8 +183,6 @@ module.exports = {
   },
 
   getMethodAuthorization(http) {
-    console.log('*** http')
-    console.log(http)
     if (_.get(http, 'authorizer.type') === 'AWS_IAM') {
       return {
         Properties: {
@@ -203,17 +200,6 @@ module.exports = {
           },
         };
       }
-      // if (http.authorizer && awsArnRegExs.lambdaArnExpr.test(http.authorizer)) {
-      if (http.authorizer && typeof(http.authorizer) === 'string') {
-        return {
-          Properties: {
-            AuthorizationType: 'CUSTOM',
-            AuthorizerId: http.authorizer,
-            ApiKeyRequired: true,
-            // AuthorizerId: { Ref: http.authorizer } ,
-          },
-        };
-      }
 
       const authorizerLogicalId = this.provider.naming
         .getAuthorizerLogicalId(http.authorizer.name);

lib/index.js

@@ -7,6 +7,8 @@ const compileIamRole = require('./deploy/stepFunctions/compileIamRole');
 const httpValidate = require('./deploy/events/apiGateway/validate');
 const httpResources = require('./deploy/events/apiGateway/resources');
 const httpMethods = require('./deploy/events/apiGateway/methods');
+
+// eslint-disable-next-line max-len
 const httpAuthorizers = require('serverless/lib/plugins/aws/package/compile/events/apiGateway/lib/authorizers');
 const httpCors = require('./deploy/events/apiGateway/cors');
 const httpApiKeys = require('./deploy/events/apiGateway/apiKeys');
@@ -144,6 +146,7 @@ class ServerlessStepFunctions {
           process.exitCode = 1;
         });
       }
+
       this.serverless.cli.consoleLog(result);
       return BbPromise.resolve();
     });