diff --git a/lib/apiGateway/methods.js b/lib/apiGateway/methods.js index a17c970..6024ac1 100644 --- a/lib/apiGateway/methods.js +++ b/lib/apiGateway/methods.js @@ -25,14 +25,9 @@ module.exports = { } if (http && http.cors) { - let origin = http.cors.origin - if (http.cors.origins && http.cors.origins.length) { - origin = http.cors.origins.join(',') - } - methodResponse.Properties.MethodResponses.forEach((val, i) => { methodResponse.Properties.MethodResponses[i].ResponseParameters = { - 'method.response.header.Access-Control-Allow-Origin': `'${origin}'` + 'method.response.header.Access-Control-Allow-Origin': true } }) } diff --git a/lib/apiGateway/methods.test.js b/lib/apiGateway/methods.test.js index f9e75cb..4b81b65 100644 --- a/lib/apiGateway/methods.test.js +++ b/lib/apiGateway/methods.test.js @@ -42,7 +42,7 @@ describe('#getAllServiceProxies()', () => { json1.Properties.MethodResponses[0].ResponseParameters[ 'method.response.header.Access-Control-Allow-Origin' ] - ).to.equal("'*'") + ).to.be.true const json2 = serverlessApigatewayServiceProxy.getMethodResponses({ cors: { @@ -54,7 +54,15 @@ describe('#getAllServiceProxies()', () => { json2.Properties.MethodResponses[0].ResponseParameters[ 'method.response.header.Access-Control-Allow-Origin' ] - ).to.equal("'*,http://example.com'") + ).to.be.true + + const json3 = serverlessApigatewayServiceProxy.getMethodResponses({}) + + expect( + json3.Properties.MethodResponses[0].ResponseParameters[ + 'method.response.header.Access-Control-Allow-Origin' + ] + ).to.be.undefined }) }) }) diff --git a/lib/package/dynamodb/compileMethodsToDynamodb.test.js b/lib/package/dynamodb/compileMethodsToDynamodb.test.js index b1ad295..0e2e5e5 100644 --- a/lib/package/dynamodb/compileMethodsToDynamodb.test.js +++ b/lib/package/dynamodb/compileMethodsToDynamodb.test.js @@ -829,17 +829,17 @@ describe('#compileMethodsToDynamodb()', () => { }, MethodResponses: [ { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 200 }, { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 400 }, { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 500 } diff --git a/lib/package/eventbridge/compileMethodsToEventBridge.test.js b/lib/package/eventbridge/compileMethodsToEventBridge.test.js index 46a5a0c..2ad6533 100644 --- a/lib/package/eventbridge/compileMethodsToEventBridge.test.js +++ b/lib/package/eventbridge/compileMethodsToEventBridge.test.js @@ -243,17 +243,17 @@ describe('#compileMethodsToEventBridge()', () => { }, MethodResponses: [ { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 200 }, { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 400 }, { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 500 } diff --git a/lib/package/kinesis/compileMethodsToKinesis.test.js b/lib/package/kinesis/compileMethodsToKinesis.test.js index 77d6337..b78ebd5 100644 --- a/lib/package/kinesis/compileMethodsToKinesis.test.js +++ b/lib/package/kinesis/compileMethodsToKinesis.test.js @@ -229,17 +229,17 @@ describe('#compileMethodsToKinesis()', () => { }, MethodResponses: [ { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 200 }, { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 400 }, { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 500 } diff --git a/lib/package/sns/compileMethodsToSns.test.js b/lib/package/sns/compileMethodsToSns.test.js index 1123719..a98b537 100644 --- a/lib/package/sns/compileMethodsToSns.test.js +++ b/lib/package/sns/compileMethodsToSns.test.js @@ -255,17 +255,17 @@ describe('#compileMethodsToSns()', () => { }, MethodResponses: [ { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 200 }, { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 400 }, { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 500 } diff --git a/lib/package/sqs/compileMethodsToSqs.test.js b/lib/package/sqs/compileMethodsToSqs.test.js index 678a99d..2212f1e 100644 --- a/lib/package/sqs/compileMethodsToSqs.test.js +++ b/lib/package/sqs/compileMethodsToSqs.test.js @@ -205,17 +205,17 @@ describe('#compileMethodsToSqs()', () => { }, MethodResponses: [ { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 200 }, { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 400 }, { - ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': "'*'" }, + ResponseParameters: { 'method.response.header.Access-Control-Allow-Origin': true }, ResponseModels: {}, StatusCode: 500 }