fix(common): before middleware should execute before use middleware

Closes: tsedio#1594
Oatelaus · Oct 27, 2021 · 2f5dc58 · 2f5dc58
1 parent e3d6451
commit 2f5dc58
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/packages/platform/common/src/builder/PlatformControllerBuilder.spec.ts b/packages/platform/common/src/builder/PlatformControllerBuilder.spec.ts
@@ -112,8 +112,8 @@ describe("PlatformControllerBuilder", () => {
       "/",
       Sinon.match.func,
       PlatformAcceptMimesMiddleware,
-      provider.middlewares.use[0],
       endpoint.beforeMiddlewares[0],
+      provider.middlewares.use[0],
       endpoint.middlewares[0],
       endpoint,
       endpoint.afterMiddlewares[0],
@@ -139,8 +139,8 @@ describe("PlatformControllerBuilder", () => {
       "/",
       Sinon.match.func,
       PlatformAcceptMimesMiddleware,
-      provider.middlewares.use[0],
       endpoint.beforeMiddlewares[0],
+      provider.middlewares.use[0],
       endpoint.middlewares[0],
       endpoint,
       endpoint.afterMiddlewares[0],
@@ -163,8 +163,8 @@ describe("PlatformControllerBuilder", () => {
     expect(router.use.getCall(1)).to.have.been.calledWithExactly(
       Sinon.match.func,
       PlatformAcceptMimesMiddleware,
-      provider.middlewares.use[0],
       endpoint.beforeMiddlewares[0],
+      provider.middlewares.use[0],
       endpoint.middlewares[0],
       endpoint,
       endpoint.afterMiddlewares[0],

diff --git a/packages/platform/common/src/builder/PlatformControllerBuilder.ts b/packages/platform/common/src/builder/PlatformControllerBuilder.ts
@@ -92,8 +92,8 @@ export class PlatformControllerBuilder {
       .concat(useCtxHandler(bindEndpointMiddleware(endpoint)))
       .concat(PlatformAcceptMimesMiddleware)
       .concat(hasFiles && PlatformMulterMiddleware)
-      .concat(use) // Controller use-middlewares
       .concat(beforeMiddlewares) // Endpoint before-middlewares
+      .concat(use) // Controller use-middlewares
       // .concat(endpoint.cache && PlatformCacheMiddleware)
       .concat(mldwrs) // Endpoint middlewares
       .concat(endpoint) // Endpoint metadata

diff --git a/packages/platform/platform-test-utils/src/tests/testMiddlewares.ts b/packages/platform/platform-test-utils/src/tests/testMiddlewares.ts
@@ -25,6 +25,13 @@ class AfterCustomMiddleware {
   }
 }
 
+@Middleware()
+class UseCustomMiddleware {
+  use(@Context() ctx: Context) {
+    ctx.get("stacks").push("Use - Ctrl");
+  }
+}
+
 @Middleware()
 class AfterEndpointCustomMiddleware {
   use(@Context() ctx: Context) {
@@ -49,7 +56,7 @@ class UseEndpointMiddleware {
 @Controller("/middlewares")
 @UseBefore(BeforeCustomMiddleware)
 @UseAfter(AfterCustomMiddleware)
-@Use(AfterCustomMiddleware)
+@Use(UseCustomMiddleware)
 class TestMiddlewaresCtrl {
   @Get("/scenario-1")
   @UseBefore(BeforeEndpointCustomMiddleware)
@@ -85,8 +92,8 @@ export function testMiddlewares(options: PlatformTestOptions) {
       expect(response.body).to.deep.equal({
         stacks: [
           "UseBefore - Ctrl",
-          "UseAfter - Ctrl",
           "UseBefore - endpoint",
+          "Use - Ctrl",
           "Use - endpoint",
           "endpoint",
           "UseAfter - endpoint",