fix: resolve readable stream error

Move the `express.json()` middleware up to the main app to resolve the
readable stream error

Author: mvantellingen

.changeset/chatty-pears-spend.md

@@ -0,0 +1,5 @@
+---
+"@labdigital/commercetools-mock": patch
+---
+
+Fix readable stream error

src/ctMock.ts

@@ -138,9 +138,9 @@ export class CommercetoolsMock {
 		this._oauth2.setCustomerRepository(this._repositories.customer);
 
 		const app = express();
+		app.use(express.json());
 
 		const projectRouter = express.Router({ mergeParams: true });
-		projectRouter.use(express.json());
 
 		if (!options?.silent) {
 			app.use(morgan("tiny"));

src/oauth/server.ts

@@ -75,7 +75,7 @@ export class OAuth2Server {
 		return async (request: Request, response: Response, next: NextFunction) => {
 			const token = getBearerToken(request);
 			if (!token) {
-				next(
+				return next(
 					new CommercetoolsError<InvalidTokenError>(
 						{
 							code: "invalid_token",
@@ -88,7 +88,7 @@ export class OAuth2Server {
 			}
 
 			if (!token || !this.store.validateToken(token)) {
-				next(
+				return next(
 					new CommercetoolsError<InvalidTokenError>(
 						{
 							code: "invalid_token",
@@ -99,7 +99,7 @@ export class OAuth2Server {
 				);
 			}
 
-			next();
+			return next();
 		};
 	}
 

src/services/abstract.ts

@@ -119,7 +119,7 @@ export default abstract class AbstractService {
 			},
 		);
 		if (!result) {
-			response.sendStatus(404);
+			response.status(404).send({ statusCode: 404 });
 			return;
 		}
 		response.status(200).send(result);
@@ -131,7 +131,7 @@ export default abstract class AbstractService {
 			request.params.key,
 		);
 		if (!resource) {
-			response.sendStatus(404);
+			response.status(404).send({ statusCode: 404 });
 			return;
 		}
 
@@ -143,7 +143,7 @@ export default abstract class AbstractService {
 			},
 		);
 		if (!result) {
-			response.sendStatus(404);
+			response.status(404).send({ statusCode: 404 });
 			return;
 		}
 		response.status(200).send(result);
@@ -169,7 +169,7 @@ export default abstract class AbstractService {
 			request.params.id,
 		);
 		if (!resource) {
-			response.sendStatus(404);
+			response.status(404).send({ statusCode: 404 });
 			return;
 		}
 
@@ -195,7 +195,7 @@ export default abstract class AbstractService {
 			request.params.key,
 		);
 		if (!resource) {
-			response.sendStatus(404);
+			response.status(404).send({ statusCode: 404 });
 			return;
 		}
 

src/services/custom-object.ts

@@ -52,7 +52,7 @@ export class CustomObjectService extends AbstractService {
 		);
 
 		if (!result) {
-			response.sendStatus(404);
+			response.status(404).send({ statusCode: 404 });
 			return;
 		}
 		response.status(200).send(result);
@@ -77,7 +77,7 @@ export class CustomObjectService extends AbstractService {
 		);
 
 		if (!current) {
-			response.sendStatus(404);
+			response.status(404).send({ statusCode: 404 });
 			return;
 		}
 

src/services/my-cart.ts

@@ -37,7 +37,16 @@ export class MyCartService extends AbstractService {
 	activeCart(request: Request, response: Response) {
 		const resource = this.repository.getActiveCart(request.params.projectKey);
 		if (!resource) {
-			response.sendStatus(404);
+			response.status(404).send({
+				statusCode: 404,
+				message: "No active cart exists.",
+				errors: [
+					{
+						code: "ResourceNotFound",
+						message: "No active cart exists.",
+					},
+				],
+			});
 			return;
 		}
 		response.status(200).send(resource);

src/services/my-customer.ts

@@ -44,7 +44,7 @@ export class MyCustomerService extends AbstractService {
 	getMe(request: Request, response: Response) {
 		const resource = this.repository.getMe(getRepositoryContext(request));
 		if (!resource) {
-			response.sendStatus(404);
+			response.status(404).send({ statusCode: 404 });
 			return;
 		}
 		response.status(200).send(resource);
@@ -54,7 +54,7 @@ export class MyCustomerService extends AbstractService {
 		const resource = this.repository.getMe(getRepositoryContext(request));
 
 		if (!resource) {
-			response.sendStatus(404);
+			response.status(404).send({ statusCode: 404 });
 			return;
 		}
 		const updateRequest = validateData<Update>(
@@ -75,7 +75,7 @@ export class MyCustomerService extends AbstractService {
 	deleteMe(request: Request, response: Response) {
 		const resource = this.repository.deleteMe(getRepositoryContext(request));
 		if (!resource) {
-			response.sendStatus(404);
+			response.status(404).send({ statusCode: 404 });
 			return;
 		}
 

src/services/order.ts

@@ -33,9 +33,10 @@ export class OrderService extends AbstractService {
 	}
 
 	getWithOrderNumber(request: Request, response: Response) {
+		const orderNumber = request.params.orderNumber;
 		const resource = this.repository.getWithOrderNumber(
 			getRepositoryContext(request),
-			request.params.orderNumber,
+			orderNumber,
 
 			// @ts-ignore
 			request.query,
@@ -44,6 +45,15 @@ export class OrderService extends AbstractService {
 			response.status(200).send(resource);
 			return;
 		}
-		response.sendStatus(404);
+		response.status(404).send({
+			statusCode: 404,
+			message: `The Resource with key '${orderNumber}' was not found.`,
+			errors: [
+				{
+					code: "ResourceNotFound",
+					message: `The Resource with key '${orderNumber}' was not found.`,
+				},
+			],
+		});
 	}
 }

src/services/project.ts

@@ -31,7 +31,7 @@ export class ProjectService {
 		const project = this.repository.get(getRepositoryContext(request));
 
 		if (!project) {
-			response.sendStatus(404);
+			response.status(404).send({ statusCode: 404 });
 			return;
 		}