@labdigital/commercetools-mock 2.47.0 → 2.48.0

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@labdigital/commercetools-mock",
-  "version": "2.47.0",
+  "version": "2.48.0",
   "license": "MIT",
   "author": "Michael van Tellingen",
   "type": "module",
   "exports": {
     ".": {
-      "require": "./dist/index.cjs",
+      "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "require": "./dist/index.cjs"
     }
   },
   "main": "dist/index.cjs",
@@ -19,47 +19,46 @@
     "src"
   ],
   "dependencies": {
-    "@biomejs/biome": "^1.9.4",
+    "@biomejs/biome": "1.9.4",
+    "@types/express": "^5.0.1",
+    "@types/express-serve-static-core": "^5.0.6",
     "basic-auth": "2.0.1",
-    "body-parser": "1.20.2",
-    "decimal.js": "10.4.3",
+    "body-parser": "2.2.0",
+    "decimal.js": "10.5.0",
     "deep-equal": "2.2.3",
-    "express": "4.21.1",
-    "light-my-request": "5.11.1",
+    "express": "5.1.0",
+    "light-my-request": "6.6.0",
     "lodash.isequal": "4.5.0",
     "morgan": "1.10.0",
-    "msw": "2.5.0",
-    "uuid": "9.0.1",
-    "zod": "3.22.4",
-    "zod-validation-error": "3.0.2"
+    "msw": "2.7.3",
+    "uuid": "11.1.0",
+    "zod": "3.24.2",
+    "zod-validation-error": "3.4.0"
   },
   "devDependencies": {
-    "@changesets/changelog-github": "0.5.0",
-    "@changesets/cli": "2.27.1",
+    "@changesets/changelog-github": "0.5.1",
+    "@changesets/cli": "2.28.1",
     "@commercetools/platform-sdk": "8.8.0",
     "@types/basic-auth": "1.1.8",
     "@types/body-parser": "1.19.5",
     "@types/deep-equal": "1.0.4",
-    "@types/express": "4.17.21",
-    "@types/express-serve-static-core": "4.17.43",
     "@types/lodash.isequal": "4.5.8",
     "@types/morgan": "1.9.9",
     "@types/node": "20.16.14",
     "@types/qs": "6.9.11",
     "@types/supertest": "6.0.2",
     "@types/uuid": "9.0.8",
-    "@vitest/coverage-v8": "3.0.2",
-    "esbuild": "0.20.1",
-    "fishery": "2.2.2",
+    "@vitest/coverage-v8": "3.1.1",
+    "esbuild": "0.25.2",
+    "fishery": "2.2.3",
     "got": "14.2.0",
-    "husky": "9.0.11",
-    "supertest": "6.3.4",
+    "husky": "9.1.7",
+    "supertest": "7.1.0",
     "timekeeper": "2.3.1",
-    "ts-node": "10.9.2",
-    "tslib": "2.8.0",
-    "tsup": "8.0.2",
+    "tslib": "2.8.1",
+    "tsup": "8.4.0",
     "typescript": "5.8.3",
-    "vitest": "3.0.2"
+    "vitest": "3.1.1"
   },
   "engines": {
     "node": ">=18",

package/src/ctMock.ts

@@ -170,23 +170,26 @@ export class CommercetoolsMock {
 		app.use((err: Error, req: Request, resp: Response, next: NextFunction) => {
 			if (err instanceof CommercetoolsError) {
 				if (err.errors?.length > 0) {
-					return resp.status(err.statusCode).send({
+					resp.status(err.statusCode).send({
 						statusCode: err.statusCode,
 						message: err.message,
 						errors: err.errors,
 					});
+					return;
 				}
 
-				return resp.status(err.statusCode).send({
+				resp.status(err.statusCode).send({
 					statusCode: err.statusCode,
 					message: err.message,
 					errors: [err.info],
 				});
+				return;
 			}
 			console.error(err);
-			return resp.status(500).send({
+			resp.status(500).send({
 				error: err.message,
 			});
+			return;
 		});
 
 		return app;

package/src/oauth/server.test.ts

@@ -39,6 +39,14 @@ describe("OAuth2Server", () => {
 
 			expect(response.status, JSON.stringify(body)).toBe(200);
 			expect(body).toHaveProperty("access_token");
+			expect(body).toEqual({
+				// scope: expect.stringMatching(/anonymous_id:([^\s]+)/),
+				scope: expect.any(String),
+				access_token: expect.stringMatching(/\S{8,}==$/),
+				refresh_token: expect.stringMatching(/my-project.*/),
+				expires_in: 172800,
+				token_type: "Bearer",
+			});
 		});
 
 		it("should failed on invalid refresh token", async () => {

package/src/oauth/server.ts

@@ -160,7 +160,7 @@ export class OAuth2Server {
 			);
 		}
 
-		const grantType = request.query.grant_type || request.body.grant_type;
+		const grantType = request.query.grant_type || request.body?.grant_type;
 		if (!grantType) {
 			return next(
 				new CommercetoolsError<InvalidRequestError>(
@@ -179,11 +179,12 @@ export class OAuth2Server {
 				request.credentials.clientSecret,
 				request.query.scope?.toString(),
 			);
-			return response.status(200).send(token);
+			response.status(200).send(token);
+			return;
 		}
 		if (grantType === "refresh_token") {
 			const refreshToken =
-				request.query.refresh_token?.toString() || request.body.refresh_token;
+				request.query.refresh_token?.toString() || request.body?.refresh_token;
 			if (!refreshToken) {
 				return next(
 					new CommercetoolsError<InvalidRequestError>(
@@ -214,7 +215,8 @@ export class OAuth2Server {
 					),
 				);
 			}
-			return response.status(200).send(token);
+			response.status(200).send(token);
+			return;
 		}
 		return next(
 			new CommercetoolsError<UnsupportedGrantType>(
@@ -233,7 +235,7 @@ export class OAuth2Server {
 		next: NextFunction,
 	) {
 		const projectKey = request.params.projectKey;
-		const grantType = request.query.grant_type || request.body.grant_type;
+		const grantType = request.query.grant_type || request.body?.grant_type;
 		if (!grantType) {
 			return next(
 				new CommercetoolsError<InvalidRequestError>(
@@ -247,12 +249,12 @@ export class OAuth2Server {
 		}
 
 		if (grantType === "password") {
-			const username = request.query.username || request.body.username;
+			const username = request.query.username || request.body?.username;
 			const password = hashPassword(
 				request.query.password || request.body.password,
 			);
 			const scope =
-				request.query.scope?.toString() || request.body.scope?.toString();
+				request.query.scope?.toString() || request.body?.scope?.toString();
 
 			const result = this.customerRepository.query(
 				{ projectKey: request.params.projectKey },
@@ -275,7 +277,7 @@ export class OAuth2Server {
 
 			const customer = result.results[0];
 			const token = this.store.getCustomerToken(projectKey, customer.id, scope);
-			return response.status(200).send(token);
+			response.status(200).send(token);
 		}
 	}
 
@@ -328,7 +330,8 @@ export class OAuth2Server {
 
 			const customer = result.results[0];
 			const token = this.store.getCustomerToken(projectKey, customer.id, scope);
-			return response.status(200).send(token);
+			response.status(200).send(token);
+			return;
 		}
 	}
 
@@ -353,7 +356,7 @@ export class OAuth2Server {
 
 		if (grantType === "client_credentials") {
 			const scope =
-				request.query.scope?.toString() || request.body.scope?.toString();
+				request.query.scope?.toString() || request.body?.scope?.toString();
 
 			const anonymous_id = undefined;
 
@@ -362,7 +365,8 @@ export class OAuth2Server {
 				anonymous_id,
 				scope,
 			);
-			return response.status(200).send(token);
+			response.status(200).send(token);
+			return;
 		}
 	}
 }

package/src/repositories/as-associate.ts

@@ -1,5 +1,7 @@
 import { CartRepository } from "./cart";
 import { OrderRepository } from "./order";
+import { QuoteRequestRepository } from "./quote-request";
 
 export class AsAssociateOrderRepository extends OrderRepository {}
 export class AsAssociateCartRepository extends CartRepository {}
+export class AsAssociateQuoteRequestRepository extends QuoteRequestRepository {}

package/src/repositories/index.ts

@@ -3,6 +3,7 @@ import { ProductTailoringRepository } from "~src/repositories/product-tailoring"
 import {
 	AsAssociateCartRepository,
 	AsAssociateOrderRepository,
+	AsAssociateQuoteRequestRepository,
 } from "./as-associate";
 import { AssociateRoleRepository } from "./associate-role";
 import { AttributeGroupRepository } from "./attribute-group";
@@ -48,6 +49,7 @@ export const createRepositories = (config: Config) => ({
 	"as-associate": {
 		cart: new AsAssociateCartRepository(config),
 		order: new AsAssociateOrderRepository(config),
+		"quote-request": new AsAssociateQuoteRequestRepository(config),
 	},
 	"associate-role": new AssociateRoleRepository(config),
 	"attribute-group": new AttributeGroupRepository(config),

package/src/repositories/my-quote-request.ts

@@ -0,0 +1,3 @@
+import { QuoteRequestRepository } from "./quote-request";
+
+export class MyQuoteRequestRepository extends QuoteRequestRepository {}

package/src/repositories/quote-request/index.ts

@@ -2,6 +2,7 @@ import assert from "node:assert";
 import type {
 	Cart,
 	CartReference,
+	MyQuoteRequestDraft,
 	QuoteRequest,
 	QuoteRequestDraft,
 } from "@commercetools/platform-sdk";
@@ -17,7 +18,18 @@ export class QuoteRequestRepository extends AbstractResourceRepository<"quote-re
 		this.actions = new QuoteRequestUpdateHandler(config.storage);
 	}
 
-	create(context: RepositoryContext, draft: QuoteRequestDraft): QuoteRequest {
+	create(
+		context: RepositoryContext,
+		draft: QuoteRequestDraft | MyQuoteRequestDraft,
+	): QuoteRequest {
+		// Handle the 'my' version of the draft
+		if ("cartId" in draft) {
+			return this.createFromCart(context, {
+				id: draft.cartId,
+				typeId: "cart",
+			});
+		}
+
 		assert(draft.cart, "draft.cart is missing");
 		return this.createFromCart(context, {
 			id: draft.cart.id!,

package/src/services/abstract.ts

@@ -64,15 +64,26 @@ export default abstract class AbstractService {
 		}
 
 		const result = this.repository.query(getRepositoryContext(request), params);
-		return response.status(200).send(result);
+		response.status(200).send(result);
+		return;
 	}
 
 	getWithId(request: Request, response: Response) {
 		const result = this._expandWithId(request, request.params.id);
 		if (!result) {
-			return response.status(404).send();
+			response.status(404).send({
+				statusCode: 404,
+				message: `The Resource with ID '${request.params.id} was not found.`,
+				errors: [
+					{
+						code: "ResourceNotFound",
+						message: `The Resource with ID '${request.params.id} was not found.`,
+					},
+				],
+			});
+			return;
 		}
-		return response.status(200).send(result);
+		response.status(200).send(result);
 	}
 
 	getWithKey(request: Request, response: Response) {
@@ -83,8 +94,20 @@ export default abstract class AbstractService {
 				expand: this._parseParam(request.query.expand),
 			},
 		);
-		if (!result) return response.status(404).send();
-		return response.status(200).send(result);
+		if (!result) {
+			response.status(404).send({
+				statusCode: 404,
+				message: `The Resource with key '${request.params.id} was not found.`,
+				errors: [
+					{
+						code: "ResourceNotFound",
+						message: `The Resource with key '${request.params.id} was not found.`,
+					},
+				],
+			});
+			return;
+		}
+		response.status(200).send(result);
 	}
 
 	deleteWithId(request: Request, response: Response) {
@@ -96,9 +119,10 @@ export default abstract class AbstractService {
 			},
 		);
 		if (!result) {
-			return response.status(404).send("Not found");
+			response.sendStatus(404);
+			return;
 		}
-		return response.status(200).send(result);
+		response.status(200).send(result);
 	}
 
 	deleteWithKey(request: Request, response: Response) {
@@ -107,7 +131,8 @@ export default abstract class AbstractService {
 			request.params.key,
 		);
 		if (!resource) {
-			return response.status(404).send("Not found");
+			response.sendStatus(404);
+			return;
 		}
 
 		const result = this.repository.delete(
@@ -118,9 +143,10 @@ export default abstract class AbstractService {
 			},
 		);
 		if (!result) {
-			return response.status(404).send("Not found");
+			response.sendStatus(404);
+			return;
 		}
-		return response.status(200).send(result);
+		response.status(200).send(result);
 	}
 
 	post(request: Request, response: Response) {
@@ -130,7 +156,7 @@ export default abstract class AbstractService {
 			draft,
 		);
 		const result = this._expandWithId(request, resource.id);
-		return response.status(this.createStatusCode).send(result);
+		response.status(this.createStatusCode).send(result);
 	}
 
 	postWithId(request: Request, response: Response) {
@@ -143,7 +169,8 @@ export default abstract class AbstractService {
 			request.params.id,
 		);
 		if (!resource) {
-			return response.status(404).send("Not found");
+			response.sendStatus(404);
+			return;
 		}
 
 		const updatedResource = this.repository.processUpdateActions(
@@ -154,7 +181,7 @@ export default abstract class AbstractService {
 		);
 
 		const result = this._expandWithId(request, updatedResource.id);
-		return response.status(200).send(result);
+		response.status(200).send(result);
 	}
 
 	postWithKey(request: Request, response: Response) {
@@ -168,7 +195,8 @@ export default abstract class AbstractService {
 			request.params.key,
 		);
 		if (!resource) {
-			return response.status(404).send("Not found");
+			response.sendStatus(404);
+			return;
 		}
 
 		const updatedResource = this.repository.processUpdateActions(
@@ -179,7 +207,7 @@ export default abstract class AbstractService {
 		);
 
 		const result = this._expandWithId(request, updatedResource.id);
-		return response.status(200).send(result);
+		response.status(200).send(result);
 	}
 
 	protected _expandWithId(request: Request, resourceId: string) {

package/src/services/as-associate-quote-request.ts

@@ -0,0 +1,34 @@
+import { Router } from "express";
+import type { MyQuoteRequestRepository } from "~src/repositories/my-quote-request";
+import type { MyOrderRepository } from "../repositories/my-order";
+import AbstractService from "./abstract";
+
+export class AsAssociateQuoteRequestService extends AbstractService {
+	public repository: MyQuoteRequestRepository;
+
+	constructor(parent: Router, repository: MyQuoteRequestRepository) {
+		super(parent);
+		this.repository = repository;
+	}
+
+	getBasePath() {
+		return "quote-requests";
+	}
+
+	registerRoutes(parent: Router) {
+		const basePath = this.getBasePath();
+		const router = Router({ mergeParams: true });
+
+		this.extraRoutes(router);
+
+		router.get("/", this.get.bind(this));
+		router.get("/:id", this.getWithId.bind(this));
+
+		router.delete("/:id", this.deleteWithId.bind(this));
+
+		router.post("/", this.post.bind(this));
+		router.post("/:id", this.postWithId.bind(this));
+
+		parent.use(`/${basePath}`, router);
+	}
+}

package/src/services/as-associate.ts

@@ -2,13 +2,16 @@ import { Router } from "express";
 import type {
 	AsAssociateCartRepository,
 	AsAssociateOrderRepository,
+	AsAssociateQuoteRequestRepository,
 } from "~src/repositories/as-associate";
 import { AsAssociateCartService } from "./as-associate-cart";
 import { AsAssociateOrderService } from "./as-associate-order";
+import { AsAssociateQuoteRequestService } from "./as-associate-quote-request";
 
 type Repositories = {
 	cart: AsAssociateCartRepository;
 	order: AsAssociateOrderRepository;
+	"quote-request": AsAssociateQuoteRequestRepository;
 };
 
 export class AsAssociateService {
@@ -17,6 +20,7 @@ export class AsAssociateService {
 	subServices: {
 		cart: AsAssociateCartService;
 		order: AsAssociateOrderService;
+		"quote-request": AsAssociateQuoteRequestService;
 	};
 
 	constructor(parent: Router, repositories: Repositories) {
@@ -25,6 +29,10 @@ export class AsAssociateService {
 		this.subServices = {
 			order: new AsAssociateOrderService(this.router, repositories.order),
 			cart: new AsAssociateCartService(this.router, repositories.cart),
+			"quote-request": new AsAssociateQuoteRequestService(
+				this.router,
+				repositories["quote-request"],
+			),
 		};
 		parent.use(
 			"/as-associate/:associateId/in-business-unit/key=:businessUnitId",

package/src/services/cart.ts

@@ -38,7 +38,8 @@ export class CartService extends AbstractService {
 				: this.repository.get(context, request.body.reference.id);
 
 		if (!cartOrOrder) {
-			return response.status(400).send();
+			response.status(400).send();
+			return;
 		}
 
 		const cartDraft: CartDraft = {
@@ -55,6 +56,6 @@ export class CartService extends AbstractService {
 
 		const newCart = this.repository.create(context, cartDraft);
 
-		return response.status(200).send(newCart);
+		response.status(200).send(newCart);
 	}
 }

package/src/services/custom-object.ts

@@ -41,7 +41,7 @@ export class CustomObjectService extends AbstractService {
 			},
 		);
 
-		return response.status(200).send(result);
+		response.status(200).send(result);
 	}
 
 	getWithContainerAndKey(request: Request, response: Response) {
@@ -52,9 +52,10 @@ export class CustomObjectService extends AbstractService {
 		);
 
 		if (!result) {
-			return response.status(404).send("Not Found");
+			response.sendStatus(404);
+			return;
 		}
-		return response.status(200).send(result);
+		response.status(200).send(result);
 	}
 
 	createWithContainerAndKey(request: Request, response: Response) {
@@ -65,7 +66,7 @@ export class CustomObjectService extends AbstractService {
 		};
 
 		const result = this.repository.create(getRepositoryContext(request), draft);
-		return response.status(200).send(result);
+		response.status(200).send(result);
 	}
 
 	deleteWithContainerAndKey(request: Request, response: Response) {
@@ -76,7 +77,8 @@ export class CustomObjectService extends AbstractService {
 		);
 
 		if (!current) {
-			return response.status(404).send("Not Found");
+			response.sendStatus(404);
+			return;
 		}
 
 		const result = this.repository.delete(
@@ -84,6 +86,6 @@ export class CustomObjectService extends AbstractService {
 			current.id,
 		);
 
-		return response.status(200).send(result);
+		response.status(200).send(result);
 	}
 }

package/src/services/customer.ts

@@ -34,7 +34,7 @@ export class CustomerService extends AbstractService {
 		const result: CustomerSignInResult = {
 			customer: expanded,
 		};
-		return response.status(this.createStatusCode).send(result);
+		response.status(this.createStatusCode).send(result);
 	}
 
 	passwordResetToken(request: Request, response: Response) {
@@ -43,7 +43,7 @@ export class CustomerService extends AbstractService {
 			request.body,
 		);
 
-		return response.status(200).send(customer);
+		response.status(200).send(customer);
 	}
 
 	passwordReset(request: Request, response: Response) {
@@ -52,7 +52,7 @@ export class CustomerService extends AbstractService {
 			request.body,
 		);
 
-		return response.status(200).send(customer);
+		response.status(200).send(customer);
 	}
 
 	confirmEmailToken(request: Request, response: Response) {
@@ -61,6 +61,6 @@ export class CustomerService extends AbstractService {
 			getRepositoryContext(request),
 			id,
 		);
-		return response.status(200).send(token);
+		response.status(200).send(token);
 	}
 }

package/src/services/my-cart.ts

@@ -37,8 +37,9 @@ export class MyCartService extends AbstractService {
 	activeCart(request: Request, response: Response) {
 		const resource = this.repository.getActiveCart(request.params.projectKey);
 		if (!resource) {
-			return response.status(404).send("Not found");
+			response.sendStatus(404);
+			return;
 		}
-		return response.status(200).send(resource);
+		response.status(200).send(resource);
 	}
 }