From 2443f2c75574c7ce44195ae3b5192841d97bea3b Mon Sep 17 00:00:00 2001 From: Joachim Van Herwegen Date: Wed, 16 Dec 2020 15:01:59 +0100 Subject: [PATCH] fix: Execute only one main handler. --- config/presets/http.json | 13 +++++++++---- test/integration/Middleware.test.ts | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/config/presets/http.json b/config/presets/http.json index 40f02dc1e..a67292862 100644 --- a/config/presets/http.json +++ b/config/presets/http.json @@ -26,10 +26,15 @@ "@id": "urn:solid-server:default:Middleware" }, { - "@id": "urn:solid-server:default:PodManagerHandler" - }, - { - "@id": "urn:solid-server:default:LdpHandler" + "@type": "WaterfallHandler", + "WaterfallHandler:_handlers": [ + { + "@id": "urn:solid-server:default:PodManagerHandler" + }, + { + "@id": "urn:solid-server:default:LdpHandler" + } + ] } ] } diff --git a/test/integration/Middleware.test.ts b/test/integration/Middleware.test.ts index a4a854bfb..c60085552 100644 --- a/test/integration/Middleware.test.ts +++ b/test/integration/Middleware.test.ts @@ -5,6 +5,7 @@ import { HttpHandler } from '../../src/server/HttpHandler'; import type { HttpRequest } from '../../src/server/HttpRequest'; import type { HttpResponse } from '../../src/server/HttpResponse'; import { instantiateFromConfig } from '../configs/Util'; +import { StaticAsyncHandler } from '../util/StaticAsyncHandler'; const port = 6002; @@ -21,7 +22,7 @@ describe('An Express server with middleware', (): void => { beforeAll(async(): Promise => { const factory = await instantiateFromConfig( 'urn:solid-server:default:ExpressHttpServerFactory', 'middleware.json', { - 'urn:solid-server:default:PodManagerHandler': new SimpleHttpHandler(), + 'urn:solid-server:default:PodManagerHandler': new StaticAsyncHandler(false, null), 'urn:solid-server:default:LdpHandler': new SimpleHttpHandler(), 'urn:solid-server:default:variable:port': port, 'urn:solid-server:default:variable:baseUrl': 'https://example.pod/',