Keep static middleware when options contain no middleware field

Author: bodograumann

modules/openapi-generator/src/main/resources/typescript/configuration.mustache

@@ -113,7 +113,7 @@ export function mergeConfiguration(conf: Configuration, options?: Configuration)
 {{/useInversify}}
 {{^useInversify}}
 export function mergeConfiguration(conf: Configuration, options?: ConfigurationOptions): Configuration {
-    let allMiddleware: Middleware[] = [];
+    let allMiddleware: Middleware[] = conf.middleware;
     if (options && options.middleware) {
         const middlewareMergeStrategy = options.middlewareMergeStrategy || "replace" // default to replace behavior
         // call-time middleware provided
@@ -138,7 +138,7 @@ export function mergeConfiguration(conf: Configuration, options?: ConfigurationO
           baseServer: options.baseServer || conf.baseServer,
           httpApi: options.httpApi || conf.httpApi,
           authMethods: options.authMethods || conf.authMethods,
-          middleware: allMiddleware || conf.middleware
+          middleware: allMiddleware,
         };
     }
     return conf;

samples/openapi3/client/petstore/typescript/tests/default/test/api/PetApi.test.ts

@@ -103,6 +103,24 @@ describe("PetApi", () => {
     expect(CallOrder).deep.equal(['base-pre', 'base-post'])
   })
 
+  it("should keep middleware when options are given without middleware", async () => {
+    let { CallOrder, BaseMiddleware, CalltimeMiddleware } = MiddlewareCallTracker()
+    const configuration = petstore.createConfiguration({ promiseMiddleware: [BaseMiddleware] });
+    const petApi = new petstore.PetApi(configuration);
+    const callTimeAppendedRightPet = await petApi.getPetById(pet.id, {});
+    expect(callTimeAppendedRightPet).to.deep.equal(pet);
+    expect(CallOrder).deep.equal(['base-pre', 'base-post'])
+  })
+
+  it("should replace middleware when options contain an empty array of middlewares", async () => {
+    let { CallOrder, BaseMiddleware, CalltimeMiddleware } = MiddlewareCallTracker()
+    const configuration = petstore.createConfiguration({ promiseMiddleware: [BaseMiddleware] });
+    const petApi = new petstore.PetApi(configuration);
+    const callTimeAppendedRightPet = await petApi.getPetById(pet.id, { middleware: [] });
+    expect(callTimeAppendedRightPet).to.deep.equal(pet);
+    expect(CallOrder).deep.equal([])
+  })
+
   it("replace Middleware call order", async () => {
     let { CallOrder, BaseMiddleware, CalltimeMiddleware } = MiddlewareCallTracker()
     const configuration = petstore.createConfiguration({ promiseMiddleware: [BaseMiddleware] })