fix: cors options pass by promise (#130)

* fix: cors options delegator parameter

* refactor: update plugin types

* docs: fix wrong example

* test: check function params

README.md

@@ -68,7 +68,7 @@ You can use it as is without passing any option or you can configure it as expla
 ```js
 const fastify = require('fastify')()
 
-fastify.register(require('fastify-cors'), (instance) => { (req, callback) => {
+fastify.register(require('fastify-cors'), (instance) => (req, callback) => {
   let corsOptions;
   // do not include CORS headers for requests from localhost
   if (/localhost/.test(origin)) {
@@ -77,7 +77,6 @@ fastify.register(require('fastify-cors'), (instance) => { (req, callback) => {
     corsOptions = { origin: true }
   }
   callback(null, corsOptions) // callback expects two parameters: error and options
-  }
 })
 
 fastify.get('/', (req, reply) => {

index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 
-import { FastifyInstance, FastifyPlugin, FastifyRequest } from 'fastify'
+import { FastifyInstance, FastifyPluginCallback, FastifyRequest } from 'fastify';
 
 type OriginCallback = (err: Error | null, allow: boolean) => void;
 export type OriginFunction = (origin: string, callback: OriginCallback) => void;
@@ -74,5 +74,5 @@ export interface FastifyCorsOptionsDelegatePromise { (req: FastifyRequest):  Pro
 export type FastifyCorsOptionsDelegate = FastifyCorsOptionsDelegateCallback | FastifyCorsOptionsDelegatePromise
 export type FastifyPluginOptionsDelegate<T> = (instance: FastifyInstance) => T;
 
-declare const fastifyCors: FastifyPlugin<FastifyCorsOptions | FastifyPluginOptionsDelegate<FastifyCorsOptionsDelegate>>;
+declare const fastifyCors: FastifyPluginCallback<FastifyCorsOptions | FastifyPluginOptionsDelegate<FastifyCorsOptionsDelegate>>;
 export default fastifyCors;

index.js

@@ -56,7 +56,7 @@ function handleCorsOptionsDelegator (optionsResolver, fastify) {
       return
     } else {
       // handle delegator based on Promise
-      const ret = optionsResolver(reply)
+      const ret = optionsResolver(req)
       if (ret && typeof ret.then === 'function') {
         ret.then(options => Object.assign({}, defaultOptions, options))
           .then(corsOptions => onRequest(fastify, corsOptions, req, reply, next)).catch(next)

test/cors.test.js

@@ -88,7 +88,7 @@ test('Should add cors headers (custom values)', t => {
 })
 
 test('Should support dynamic config (callback)', t => {
-  t.plan(10)
+  t.plan(16)
 
   const configs = [{
     origin: 'example.com',
@@ -109,6 +109,10 @@ test('Should support dynamic config (callback)', t => {
   const fastify = Fastify()
   let requestId = 0
   const configDelegation = function (req, cb) {
+    // request should have id
+    t.ok(req.id)
+    // request should not have send
+    t.notOk(req.send)
     const config = configs[requestId]
     requestId++
     if (config) {
@@ -178,7 +182,7 @@ test('Should support dynamic config (callback)', t => {
 })
 
 test('Should support dynamic config (Promise)', t => {
-  t.plan(10)
+  t.plan(16)
 
   const configs = [{
     origin: 'example.com',
@@ -199,6 +203,10 @@ test('Should support dynamic config (Promise)', t => {
   const fastify = Fastify()
   let requestId = 0
   const configDelegation = function (req) {
+    // request should have id
+    t.ok(req.id)
+    // request should not have send
+    t.notOk(req.send)
     const config = configs[requestId]
     requestId++
     if (config) {