Skip to content
This repository was archived by the owner on Jun 8, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions src/Cors/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -272,20 +272,16 @@ class Cors {
._setExposeHeaders(response)

/**
* If request is not for OPTIONS call next. Otherwise set
* CORS headers.
* If request is OPTIONS set CORS headers before call next.
*/
if (request.method() !== 'OPTIONS') {
await next()
return
if (request.method() === 'OPTIONS') {
this
._setMethods(response)
._setHeaders(request.header('access-control-request-headers'), response)
._setMaxAge(response)
}

this
._setMethods(response)
._setHeaders(request.header('access-control-request-headers'), response)
._setMaxAge(response)

response.header('Content-length', 0).status(204).send('')
return next()
}
}

Expand Down
4 changes: 1 addition & 3 deletions test/cors.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -353,10 +353,8 @@ test.group('Cors', () => {
{ key: 'Access-Control-Allow-Credentials', value: true },
{ key: 'Access-Control-Allow-Methods', value: 'GET,PUT,POST' },
{ key: 'Access-Control-Allow-Headers', value: 'Authorization' },
{ key: 'Access-Control-Max-Age', value: 90 },
{ key: 'Content-length', value: 0 }
{ key: 'Access-Control-Max-Age', value: 90 }
])
assert.equal(response._status, 204)
})

test('set vary header when options.origin is a string', async (assert) => {
Expand Down