Skip to content

Commit 0a586a0

Browse files
committed
Update deps
1 parent 919bc9e commit 0a586a0

File tree

2 files changed

+33
-27
lines changed

2 files changed

+33
-27
lines changed

package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
"url": "https://github.com/simov/grant.git"
3030
},
3131
"dependencies": {
32-
"qs": "^6.10.2",
33-
"request-compose": "^2.1.4",
32+
"qs": "^6.11.2",
33+
"request-compose": "^2.1.6",
3434
"request-oauth": "^1.0.1"
3535
},
3636
"optionalDependencies": {
37-
"cookie": "^0.4.1",
38-
"cookie-signature": "^1.1.0",
37+
"cookie": "^0.5.0",
38+
"cookie-signature": "^1.2.1",
3939
"jwk-to-pem": "^2.0.5",
4040
"jws": "^4.0.0"
4141
},
@@ -44,26 +44,26 @@
4444
"@curveball/core": "0.14.2",
4545
"@curveball/router": "0.2.4",
4646
"@curveball/session": "0.5.0",
47-
"@fastify/session": "^6.3.0",
48-
"@hapi/hapi": "^20.2.1",
49-
"@hapi/yar": "^10.1.1",
50-
"body-parser": "^1.19.1",
51-
"cookie-session": "^1.4.0",
52-
"express": "^4.17.2",
53-
"express-session": "^1.17.2",
54-
"fastify": "^3.25.2",
55-
"fastify-cookie": "^5.4.0",
56-
"fastify-formbody": "^5.2.0",
47+
"@fastify/cookie": "^9.1.0",
48+
"@fastify/formbody": "^7.4.0",
49+
"@fastify/session": "^10.5.0",
50+
"@hapi/hapi": "^21.3.2",
51+
"@hapi/yar": "^11.0.1",
52+
"body-parser": "^1.20.2",
53+
"cookie-session": "^2.0.0",
54+
"express": "^4.18.2",
55+
"express-session": "^1.17.3",
56+
"fastify": "^4.23.2",
5757
"grant-profile": "^1.0.2",
58-
"koa": "^2.13.4",
59-
"koa-bodyparser": "^4.3.0",
58+
"koa": "^2.14.2",
59+
"koa-bodyparser": "^4.4.1",
6060
"koa-mount": "^4.0.0",
6161
"koa-qs": "^3.0.0",
62-
"koa-session": "^6.2.0",
63-
"mocha": "^9.1.3",
62+
"koa-session": "^6.4.0",
63+
"mocha": "^10.2.0",
6464
"nyc": "^15.1.0",
65-
"request-cookie": "^1.0.0",
66-
"request-logs": "^2.1.4"
65+
"request-cookie": "^1.0.1",
66+
"request-logs": "^2.1.5"
6767
},
6868
"main": "./grant.js",
6969
"files": [

test/util/client.js

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,15 @@ catch (err) {
2626
}
2727

2828
var fastify = require('fastify')
29-
fastify.cookie = require('fastify-cookie')
3029
fastify.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

3339
var {Application:curveball} = require('@curveball/core')
3440
curveball.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

Comments
 (0)