Skip to content

Commit

Permalink
Revert "fix: support for embedded cors for route params (#278)"
Browse files Browse the repository at this point in the history
This reverts commit 9acbafe.
  • Loading branch information
climba03003 authored and mcollina committed Dec 18, 2023
1 parent 79b3de9 commit 6448dc9
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 37 deletions.
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ function fastifyCors (fastify, opts, next) {
// remove most headers (such as the Authentication header).
//
// This route simply enables fastify to accept preflight requests.
fastify.options('/*', { schema: { hide: hideOptionsRoute } }, (req, reply) => {
fastify.options('*', { schema: { hide: hideOptionsRoute } }, (req, reply) => {
if (!req.corsPreflightEnabled) {
// Do not handle preflight requests if the origin option disabled CORS
reply.callNotFound()
Expand Down
35 changes: 1 addition & 34 deletions test/cors.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,7 @@ test('Should support dynamic config. (Invalid function)', t => {
t.plan(2)

const fastify = Fastify()
fastify.register(cors, () => (a, b, c) => { })
fastify.register(cors, () => (a, b, c) => {})

fastify.get('/', (req, reply) => {
reply.send('ok')
Expand Down Expand Up @@ -942,36 +942,3 @@ test('Should support wildcard config /2', t => {
t.equal(res.headers['access-control-allow-origin'], '*')
})
})

test('should support embedded cors registration with route params', t => {
t.plan(3)

const fastify = Fastify()

const custom = async (instance, opts) => {
instance.register(cors, {
origin: ['example.com']
})

instance.get('/route1', (req, reply) => {
reply.send('ok')
})
}

fastify.register(custom, {
prefix: '/:id'
})

fastify.inject({
method: 'OPTIONS',
url: '/id1/route1',
headers: {
'access-control-request-method': 'GET',
origin: 'example.com'
}
}, (err, res) => {
t.error(err)
t.equal(res.statusCode, 204)
t.equal(res.headers['access-control-allow-origin'], 'example.com')
})
})
4 changes: 2 additions & 2 deletions test/preflight.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ test('hide options route by default', t => {
const fastify = Fastify()

fastify.addHook('onRoute', (route) => {
if (route.method === 'OPTIONS' && route.url === '/*') {
if (route.method === 'OPTIONS' && route.url === '*') {
t.equal(route.schema.hide, true)
}
})
Expand All @@ -206,7 +206,7 @@ test('show options route', t => {
const fastify = Fastify()

fastify.addHook('onRoute', (route) => {
if (route.method === 'OPTIONS' && route.url === '/*') {
if (route.method === 'OPTIONS' && route.url === '*') {
t.equal(route.schema.hide, false)
}
})
Expand Down

0 comments on commit 6448dc9

Please sign in to comment.