Skip to content

replace http-errors with @fastify/error #99

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mcollina merged 1 commit into from
Jul 11, 2022
Merged

replace http-errors with @fastify/error #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,13 @@

const fp = require('fastify-plugin')
const auth = require('basic-auth')
const { Unauthorized } = require('http-errors')
const createError = require('@fastify/error')

const MissingOrBadAuthorizationHeader = createError(
'FST_BASIC_AUTH_MISSING_OR_BAD_AUTHORIZATION_HEADER',
'Missing or bad formatted authorization header',
401
)

async function basicPlugin (fastify, opts) {
if (typeof opts.validate !== 'function') {
Expand All @@ -17,7 +23,7 @@ async function basicPlugin (fastify, opts) {
function basicAuth (req, reply, next) {
const credentials = auth.parse(req.headers[header])
if (credentials == null) {
done(new Unauthorized('Missing or bad formatted authorization header'))
done(new MissingOrBadAuthorizationHeader())
} else {
const result = validate(credentials.name, credentials.pass, req, reply, done)
if (result && typeof result.then === 'function') {
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
"tsd": "^0.22.0"
},
"dependencies": {
"@fastify/error": "^3.0.0",
"basic-auth": "^2.0.1",
"fastify-plugin": "^3.0.0",
"http-errors": "^2.0.0"
"fastify-plugin": "^3.0.0"
},
"publishConfig": {
"access": "public"
Expand Down
9 changes: 6 additions & 3 deletions test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ const { test } = require('tap')
const Fastify = require('fastify')
const basicAuth = require('./index')
const fastifyAuth = require('@fastify/auth')
const { Unauthorized } = require('http-errors')

test('Basic', t => {
t.plan(2)
Expand Down Expand Up @@ -476,6 +475,7 @@ test('Missing header', t => {
t.equal(res.statusCode, 401)
t.same(JSON.parse(res.payload), {
statusCode: 401,
code: 'FST_BASIC_AUTH_MISSING_OR_BAD_AUTHORIZATION_HEADER',
error: 'Unauthorized',
message: 'Missing or bad formatted authorization header'
})
Expand Down Expand Up @@ -567,7 +567,7 @@ test('setErrorHandler custom error and 401', t => {
})

test('Missing header and custom error handler', t => {
t.plan(4)
t.plan(6)

const fastify = Fastify()
fastify.register(basicAuth, { validate })
Expand All @@ -592,7 +592,9 @@ test('Missing header and custom error handler', t => {
})

fastify.setErrorHandler(function (err, req, reply) {
t.ok(err instanceof Unauthorized)
t.ok(err instanceof Error)
t.ok(err.statusCode === 401)
t.ok(err.code === 'FST_BASIC_AUTH_MISSING_OR_BAD_AUTHORIZATION_HEADER')
reply.send(err)
})

Expand All @@ -604,6 +606,7 @@ test('Missing header and custom error handler', t => {
t.equal(res.statusCode, 401)
t.same(JSON.parse(res.payload), {
statusCode: 401,
code: 'FST_BASIC_AUTH_MISSING_OR_BAD_AUTHORIZATION_HEADER',
error: 'Unauthorized',
message: 'Missing or bad formatted authorization header'
})
Expand Down