@labdigital/commercetools-mock 1.11.0 → 2.0.0

package/dist/index.d.cts

@@ -630,7 +630,7 @@ declare class CommercetoolsMock {
     options: CommercetoolsMockOptions;
     private _storage;
     private _oauth2;
-    private _nockScopes;
+    private _mswServer;
     private _services;
     private _repositories;
     private _projectService?;
@@ -641,8 +641,7 @@ declare class CommercetoolsMock {
     project(projectKey?: string): ProjectAPI;
     runServer(port?: number, options?: AppOptions): void;
     private createApp;
-    private mockApiHost;
-    private mockAuthHost;
+    private startServer;
 }
 
 declare const getBaseResourceProperties: () => {

package/dist/index.d.ts

@@ -630,7 +630,7 @@ declare class CommercetoolsMock {
     options: CommercetoolsMockOptions;
     private _storage;
     private _oauth2;
-    private _nockScopes;
+    private _mswServer;
     private _services;
     private _repositories;
     private _projectService?;
@@ -641,8 +641,7 @@ declare class CommercetoolsMock {
     project(projectKey?: string): ProjectAPI;
     runServer(port?: number, options?: AppOptions): void;
     private createApp;
-    private mockApiHost;
-    private mockAuthHost;
+    private startServer;
 }
 
 declare const getBaseResourceProperties: () => {

package/dist/index.js

@@ -1,8 +1,9 @@
 // src/ctMock.ts
-import nock from "nock";
 import express2 from "express";
 import supertest from "supertest";
 import morgan from "morgan";
+import { setupServer } from "msw/node";
+import { http, HttpResponse } from "msw";
 
 // src/storage/abstract.ts
 var AbstractStorage = class {
@@ -1378,19 +1379,19 @@ var ProjectAPI = class {
 
 // src/lib/proxy.ts
 var copyHeaders = (headers) => {
-  const validHeaders = ["accept", "host", "authorization"];
+  const validHeaders = ["accept", "host", "authorization", "content-type"];
   const result = {};
-  Object.entries(headers).forEach(([key, value]) => {
+  for (const [key, value] of headers.entries()) {
     if (validHeaders.includes(key.toLowerCase())) {
       result[key] = value;
     }
-  });
+  }
   return result;
 };
 
 // src/constants.ts
-var DEFAULT_API_HOSTNAME = /^https:\/\/api\..*?\.commercetools.com:443$/;
-var DEFAULT_AUTH_HOSTNAME = /^https:\/\/auth\..*?\.commercetools.com:443$/;
+var DEFAULT_API_HOSTNAME = "https://api.*.commercetools.com";
+var DEFAULT_AUTH_HOSTNAME = "https://auth.*.commercetools.com";
 
 // src/repositories/helpers.ts
 import { v4 as uuidv42 } from "uuid";
@@ -6365,12 +6366,13 @@ var DEFAULT_OPTIONS = {
   authHost: DEFAULT_AUTH_HOSTNAME,
   silent: false
 };
+var _globalListeners = [];
 var CommercetoolsMock = class {
   app;
   options;
   _storage;
   _oauth2;
-  _nockScopes = { auth: void 0, api: void 0 };
+  _mswServer = void 0;
   _services;
   _repositories;
   _projectService;
@@ -6387,16 +6389,15 @@ var CommercetoolsMock = class {
     this.app = this.createApp({ silent: this.options.silent });
   }
   start() {
-    this.mockAuthHost();
-    this.mockApiHost();
+    this.clear();
+    this.startServer();
   }
   stop() {
-    this._nockScopes.auth?.persist(false);
-    this._nockScopes.auth = void 0;
-    this._nockScopes.api?.persist(false);
-    this._nockScopes.api = void 0;
+    this._mswServer?.close();
+    this._mswServer = void 0;
   }
   clear() {
+    this._mswServer?.resetHandlers();
     this._storage.clear();
   }
   project(projectKey) {
@@ -6459,25 +6460,65 @@ var CommercetoolsMock = class {
     });
     return app;
   }
-  mockApiHost() {
-    const app = this.app;
-    this._nockScopes.api = nock(this.options.apiHost).persist().get(/.*/).reply(async function(uri) {
-      const response = await supertest(app).get(uri).set(copyHeaders(this.req.headers));
-      return [response.status, response.body];
-    }).post(/.*/).reply(async function(uri, body) {
-      const response = await supertest(app).post(uri).set(copyHeaders(this.req.headers)).send(body);
-      return [response.status, response.body];
-    }).delete(/.*/).reply(async function(uri, body) {
-      const response = await supertest(app).delete(uri).set(copyHeaders(this.req.headers)).send(body);
-      return [response.status, response.body];
-    });
-  }
-  mockAuthHost() {
+  startServer() {
+    if (_globalListeners.length > 0) {
+      if (this._mswServer !== void 0) {
+        throw new Error("Server already started");
+      } else {
+        console.warn("Server wasn't stopped properly, clearing");
+        _globalListeners.forEach((listener) => listener.close());
+      }
+    }
     const app = this.app;
-    this._nockScopes.auth = nock(this.options.authHost).persist().post(/^\/oauth\/.*/).reply(async function(uri, body) {
-      const response = await supertest(app).post(uri + "?" + body).set(copyHeaders(this.req.headers)).send();
-      return [response.status, response.body];
+    this._mswServer = setupServer(
+      http.post(`${this.options.authHost}/oauth/*`, async ({ request }) => {
+        const text = await request.text();
+        const url = new URL(request.url);
+        const res = await supertest(app).post(url.pathname + "?" + url.searchParams.toString()).set(copyHeaders(request.headers)).send(text);
+        return new HttpResponse(res.text, {
+          status: res.status,
+          headers: res.headers
+        });
+      }),
+      http.get(`${this.options.apiHost}/*`, async ({ request }) => {
+        const body = await request.text();
+        const url = new URL(request.url);
+        const res = await supertest(app).get(url.pathname + "?" + url.searchParams.toString()).set(copyHeaders(request.headers)).send(body);
+        return new HttpResponse(res.text, {
+          status: res.status,
+          headers: res.headers
+        });
+      }),
+      http.post(`${this.options.apiHost}/*`, async ({ request }) => {
+        const body = await request.text();
+        const url = new URL(request.url);
+        const res = await supertest(app).post(url.pathname + "?" + url.searchParams.toString()).set(copyHeaders(request.headers)).send(body);
+        return new HttpResponse(res.text, {
+          status: res.status,
+          headers: res.headers
+        });
+      }),
+      http.delete(`${this.options.apiHost}/*`, async ({ request }) => {
+        const body = await request.text();
+        const url = new URL(request.url);
+        const res = await supertest(app).delete(url.pathname + "?" + url.searchParams.toString()).set(copyHeaders(request.headers)).send(body);
+        return new HttpResponse(res.text, {
+          status: res.status,
+          headers: res.headers
+        });
+      })
+    );
+    this._mswServer.listen({
+      // We need to allow requests done by supertest
+      onUnhandledRequest: (request, print) => {
+        const url = new URL(request.url);
+        if (url.hostname === "127.0.0.1") {
+          return;
+        }
+        print.error();
+      }
     });
+    _globalListeners.push(this._mswServer);
   }
 };
 export {