Skip to content

Commit

Permalink
Merge next into master (#266)
Browse files Browse the repository at this point in the history
* Update for Fastify v5 (#251)

* upgrade for fastify 5

* added linting new line

* enable coverage

---------

Signed-off-by: Gürgün Dayıoğlu <hey@gurgun.day>
Co-authored-by: Gürgün Dayıoğlu <hey@gurgun.day>

* update fastify deps

---------

Signed-off-by: Gürgün Dayıoğlu <hey@gurgun.day>
Co-authored-by: Cristian Barlutiu <cristian.barlutiu@gmail.com>
Co-authored-by: Gürgün Dayıoğlu <hey@gurgun.day>
  • Loading branch information
3 people committed Jul 19, 2024
1 parent 3710350 commit 99d7dd2
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

jobs:
test:
uses: fastify/workflows/.github/workflows/plugins-ci.yml@v3
uses: fastify/workflows/.github/workflows/plugins-ci.yml@v4.1.0
with:
license-check: true
lint: true
2 changes: 1 addition & 1 deletion .taprc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
files:
- 'test/**/*.test.js'
- 'test/**/*.test.js'
2 changes: 2 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@ function fastifyOauth2 (fastify, options, next) {

const httpOpts = {
headers: {
/* c8 ignore next */
...options.credentials.http?.headers,
'User-Agent': userAgent
}
Expand Down Expand Up @@ -437,6 +438,7 @@ function fastifyOauth2 (fastify, options, next) {
const httpOpts = {
method,
headers: {
/* c8 ignore next */
...options.credentials.http?.headers,
'User-Agent': userAgent,
Authorization: `Bearer ${token}`
Expand Down
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,20 +28,20 @@
],
"homepage": "https://github.com/fastify/fastify-oauth2#readme",
"devDependencies": {
"@fastify/pre-commit": "^2.0.2",
"@types/node": "^20.5.3",
"@types/simple-oauth2": "^5.0.4",
"fastify": "^4.21.0",
"nock": "^13.3.3",
"@fastify/pre-commit": "^2.1.0",
"@types/node": "^20.11.30",
"@types/simple-oauth2": "^5.0.7",
"fastify": "^5.0.0-alpha.3",
"nock": "^13.5.4",
"simple-get": "^4.0.1",
"snazzy": "^9.0.0",
"standard": "^17.1.0",
"tap": "^16.3.8",
"tap": "^18.7.1",
"tsd": "^0.31.0"
},
"dependencies": {
"@fastify/cookie": "^9.0.4",
"fastify-plugin": "^4.5.1",
"@fastify/cookie": "^10.0.0-pre.fv5.1",
"fastify-plugin": "^5.0.0-pre.fv5.1",
"simple-oauth2": "^5.0.0"
},
"publishConfig": {
Expand Down

0 comments on commit 99d7dd2

Please sign in to comment.