fix(hermes): cumulative middleware context (#771)

ConduitPlatform · Oct 28, 2023 · 65dbfac · 65dbfac
1 parent 766e49a
commit 65dbfac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/libraries/hermes/src/Rest/Rest.ts b/libraries/hermes/src/Rest/Rest.ts
@@ -166,8 +166,7 @@ export class RestController extends ConduitRouter {
       };
       self
         .checkMiddlewares(context, route.input.middlewares)
-        .then(r => {
-          Object.assign(context.context, r);
+        .then(() => {
           if (route.input.action !== ConduitRouteActions.GET) {
             return route.executeRequest(context);
           }

diff --git a/libraries/hermes/src/Router.ts b/libraries/hermes/src/Router.ts
@@ -80,24 +80,24 @@ export abstract class ConduitRouter {
     this._middlewareOwners.set(middleware.name, moduleUrl);
   }
 
-  checkMiddlewares(params: ConduitRouteParameters, middlewares?: string[]) {
-    let primaryPromise = new Promise(resolve => {
-      resolve({});
-    });
+  async checkMiddlewares(params: ConduitRouteParameters, middlewares?: string[]) {
+    let primaryPromise = Promise.resolve();
     middlewares?.forEach(m => {
       const middleware = m.split('?')[0];
       if (!this._middlewares?.hasOwnProperty(middleware)) {
         primaryPromise = Promise.reject('Middleware does not exist');
       } else {
-        primaryPromise = primaryPromise.then(r => {
+        primaryPromise = primaryPromise.then(() => {
           return this._middlewares![middleware].executeRequest.bind(
             this._middlewares![middleware],
           )(params)
             .then(p => {
               if (p.result) {
-                Object.assign(r as Record<string, unknown>, JSON.parse(p.result));
+                Object.assign(
+                  params.context as Record<string, unknown>,
+                  JSON.parse(p.result),
+                );
               }
-              return r;
             })
             .catch((err: Error) => {
               if (!m.includes('?')) throw err;