fix(medusa): Update wrapHandler so it also passes errors in non-async route handlers to the errorHandler middleware (#5597)
* fix: Align @types/react versions across UI packages * update codeowners * fix: Update wrapHandler so it also catches errors for non-async route handlers * rm chaining * align wrapHandler in utils and add deprecation note --------- Co-authored-by: Oli Juhl <59018053+olivermrbl@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
c08240df3f
commit
2947f57db1
5
.changeset/eleven-books-fail.md
Normal file
5
.changeset/eleven-books-fail.md
Normal file
@@ -0,0 +1,5 @@
|
||||
---
|
||||
"@medusajs/medusa": patch
|
||||
---
|
||||
|
||||
fix(medusa): Update wrapHandler so that it is also able to catch errors for sync handlers
|
||||
@@ -2,8 +2,11 @@ import { NextFunction, Request, RequestHandler, Response } from "express"
|
||||
|
||||
type handler = (req: Request, res: Response) => Promise<void>
|
||||
|
||||
/**
|
||||
* @deprecated use `import { wrapHandler } from "@medusajs/utils"`
|
||||
*/
|
||||
export default (fn: handler): RequestHandler => {
|
||||
return (req: Request, res: Response, next: NextFunction) => {
|
||||
return async (req: Request, res: Response, next: NextFunction) => {
|
||||
if (req?.errors?.length) {
|
||||
return res.status(400).json({
|
||||
errors: req.errors,
|
||||
@@ -12,7 +15,11 @@ export default (fn: handler): RequestHandler => {
|
||||
})
|
||||
}
|
||||
|
||||
return fn(req, res).catch(next)
|
||||
try {
|
||||
return await fn(req, res)
|
||||
} catch (err) {
|
||||
next(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { promiseAll } from "@medusajs/utils"
|
||||
import { promiseAll, wrapHandler } from "@medusajs/utils"
|
||||
import cors from "cors"
|
||||
import { Router, json, text, urlencoded, type Express } from "express"
|
||||
import { readdir } from "fs/promises"
|
||||
@@ -9,7 +9,6 @@ import {
|
||||
authenticateCustomer,
|
||||
errorHandler,
|
||||
requireCustomerAuthentication,
|
||||
wrapHandler,
|
||||
} from "../../../api/middlewares"
|
||||
import { ConfigModule } from "../../../types/global"
|
||||
import logger from "../../logger"
|
||||
|
||||
@@ -3,7 +3,7 @@ import { NextFunction, Request, RequestHandler, Response } from "express"
|
||||
type handler = (req: Request, res: Response) => Promise<void>
|
||||
|
||||
export const wrapHandler = (fn: handler): RequestHandler => {
|
||||
return (req: Request, res: Response, next: NextFunction) => {
|
||||
return async (req: Request, res: Response, next: NextFunction) => {
|
||||
const req_ = req as Request & { errors?: Error[] }
|
||||
if (req_?.errors?.length) {
|
||||
return res.status(400).json({
|
||||
@@ -13,7 +13,11 @@ export const wrapHandler = (fn: handler): RequestHandler => {
|
||||
})
|
||||
}
|
||||
|
||||
return fn(req, res).catch(next)
|
||||
try {
|
||||
return await fn(req, res)
|
||||
} catch (err) {
|
||||
next(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user