@@ -26,9 +26,15 @@ catch (err) {
2626}
2727
2828var fastify = require ( 'fastify' )
29- fastify . cookie = require ( 'fastify-cookie' )
3029fastify . session = require ( '@fastify/session' )
31- fastify . parser = require ( 'fastify-formbody' )
30+ try {
31+ fastify . cookie = require ( '@fastify/cookie' )
32+ fastify . parser = require ( '@fastify/formbody' )
33+ }
34+ catch ( err ) {
35+ fastify . cookie = require ( 'fastify-cookie' )
36+ fastify . parser = require ( 'fastify-formbody' )
37+ }
3238
3339var { Application :curveball } = require ( '@curveball/core' )
3440curveball . router = require ( '@curveball/router' ) . default
@@ -143,7 +149,7 @@ var clients = {
143149 . register ( fastify . parser )
144150 . register ( grant )
145151 . route ( { method : 'GET' , path : '/' , handler : callback . fastify } )
146- . listen ( port )
152+ . listen ( { port} )
147153 . then ( ( ) => resolve ( { grant, server} ) )
148154 } ) ,
149155 curveball : ( { config, request, state, extend, port, index} ) => new Promise ( ( resolve ) => {
@@ -478,7 +484,7 @@ var clients = {
478484 t . equal ( err . message , 'Grant: register session plugin first' )
479485 } )
480486 . register ( grant )
481- . listen ( port )
487+ . listen ( { port} )
482488 . then ( ( ) => resolve ( { grant, server} ) )
483489 } ) ,
484490 curveball : ( { config, request, state, extend, port, index} ) => new Promise ( ( resolve ) => {
@@ -656,7 +662,7 @@ var clients = {
656662 secret : '01234567890123456789012345678912' , cookie : { secure : false } } )
657663 . register ( grant , { prefix : '/oauth' } )
658664 . route ( { method : 'GET' , path : '/' , handler : callback . fastify } )
659- . listen ( port )
665+ . listen ( { port} )
660666 . then ( ( ) => resolve ( { grant, server} ) )
661667 } ) ,
662668 koa1 : ( { config, port} ) => new Promise ( ( resolve ) => {
@@ -809,7 +815,7 @@ var clients = {
809815 secret : '01234567890123456789012345678912' , cookie : { secure : false } } )
810816 . register ( grant )
811817 . route ( { method : 'GET' , path : '/' , handler : callback . fastify } )
812- . listen ( port )
818+ . listen ( { port} )
813819 . then ( ( ) => resolve ( { grant, server} ) )
814820 } ) ,
815821 curveball : ( { config, port} ) => new Promise ( ( resolve ) => {
@@ -1060,7 +1066,7 @@ var clients = {
10601066 . register ( fastify . session , {
10611067 secret : '01234567890123456789012345678912' , cookie : { secure : false } } )
10621068 . register ( grant )
1063- . listen ( port )
1069+ . listen ( { port} )
10641070 . then ( ( ) => resolve ( { grant, server} ) )
10651071 } ) ,
10661072 curveball : ( { config, port} ) => new Promise ( ( resolve ) => {
0 commit comments