Skip to content
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

Bugxfix/error handling #1976

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bugxfix/error handling #1976

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0d6754
Handle non-bailo errors
JR40159 Mar 5, 2025
a2cea2b
Prevent undefined being prepended to log messages
JR40159 Mar 5, 2025
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
53 changes: 35 additions & 18 deletions backend/src/routes/middleware/expressErrorHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import { NextFunction, Request, Response } from 'express'
import { isNativeError } from 'util/types'

import audit from '../../connectors/audit/index.js'
import log from '../../services/log.js'
import { BailoError } from '../../types/error.js'
import { InternalError } from '../../utils/error.js'

export function bailoErrorGuard(err: unknown): err is BailoError {
if (typeof err !== 'object' || err === null) {
Expand All @@ -24,23 +26,38 @@ export function bailoErrorGuard(err: unknown): err is BailoError {
}

export async function expressErrorHandler(err: unknown, req: Request, res: Response, _next: NextFunction) {
if (!bailoErrorGuard(err)) {
log.error({ err }, 'No error code was found, returning generic error to user.')
throw err
if (bailoErrorGuard(err)) {
const logger = err.logger || req.log
if (err.context) {
logger.warn(err.context, err.message)
} else {
logger.warn(err.message)
}

delete err.context?.internal

await audit.onError(req, err)

return res.status(err.code).json({
error: {
name: err.name,
message: err.message,
context: err.context,
},
})
} else if (isNativeError(err)) {
log.warn(
{ err: { name: err.name, stack: err.stack } },
'Generic Javascript error found, returning generic error to user.',
)
await audit.onError(req, InternalError('Internal Server Error'))
return res.status(500).json({
error: {
name: 'Internal Server Error',
message: 'Unknown error - Please contact Bailo support',
},
})
}

const logger = err.logger || req.log
logger.warn(err.context, err.message)

delete err.context?.internal

await audit.onError(req, err)

return res.status(err.code).json({
error: {
name: err.name,
message: err.message,
context: err.context,
},
})
log.error({ err }, 'Unknown error format was found, returning generic error to user.')
throw err
}
Loading