fix cors bug

Author: horike37

lib/apiGateway/validate.js

@@ -6,11 +6,11 @@ const _ = require('lodash')
 module.exports = {
   async validateServiceProxies() {
     const events = []
+    const corsPreflight = {}
     await BbPromise.all(
       this.getAllServiceProxies().map(async (serviceProxy) => {
         Object.keys(serviceProxy).forEach(async (functionName) => {
           await this.checkAllowedService(functionName)
-          const corsPreflight = []
           const http = serviceProxy[functionName]
           http.path = await this.getProxyPath(serviceProxy[functionName])
           http.method = await this.getProxyMethod(serviceProxy[functionName])
@@ -40,7 +40,7 @@ module.exports = {
     )
     return {
       events,
-      corsPreflight: {}
+      corsPreflight
     }
   },
 

lib/index.js

@@ -8,6 +8,7 @@ const validate = require('./apiGateway/validate')
 const methods = require('./apiGateway/methods')
 const compileRestApi = require('serverless/lib/plugins/aws/package/compile/events/apiGateway/lib/restApi')
 const compileResources = require('serverless/lib/plugins/aws/package/compile/events/apiGateway/lib/resources')
+const compileCors = require('serverless/lib/plugins/aws/package/compile/events/apiGateway/lib/cors')
 const compileDeployment = require('serverless/lib/plugins/aws/package/compile/events/apiGateway/lib/deployment')
 const getStackInfo = require('serverless/lib/plugins/aws/info/getStackInfo')
 // Kinesis
@@ -29,12 +30,14 @@ class ServerlessApigatewayServiceProxy {
     this.service = this.serverless.service.service
     this.region = this.provider.getRegion()
     this.stage = this.provider.getStage()
+    this.apiGatewayMethodLogicalIds = []
     Object.assign(
       this,
       compileRestApi,
       compileResources,
       compileMethodsToKinesis,
       compileIamRoleToKinesis,
+      compileCors,
       compileDeployment,
       validateKinesisServiceProxy,
       compileKinesisServiceProxy,
@@ -53,13 +56,13 @@ class ServerlessApigatewayServiceProxy {
           this.validated = await this.validateServiceProxies()
           await this.compileRestApi()
           await this.compileResources()
+          await this.compileCors()
 
           //Kinesis proxy
           await this.compileKinesisServiceProxy()
 
           // SQS getProxy
           await this.compileSqsServiceProxy()
-
           if (await this.existsDeployment()) {
             await this.compileDeployment()
           }

lib/package/kinesis/compileMethodsToKinesis.js

@@ -5,7 +5,6 @@ const _ = require('lodash')
 
 module.exports = {
   async compileMethodsToKinesis() {
-    this.apiGatewayMethodLogicalIds = []
     this.validated.events.forEach(async (event) => {
       if (event.functionName == 'kinesis') {
         const resourceId = this.getResourceId(event.http.path)

lib/package/sqs/compileMethodsToSqs.js

@@ -5,7 +5,6 @@ const _ = require('lodash')
 
 module.exports = {
   async compileMethodsToSqs() {
-    this.apiGatewayMethodLogicalIds = []
     this.validated.events.forEach(async (event) => {
       if (event.functionName == 'sqs') {
         const resourceId = this.getResourceId(event.http.path)