fix: Execute only one main handler.

This commit is contained in:
Joachim Van Herwegen 2020-12-16 15:01:59 +01:00
parent a721684e6b
commit 2443f2c755
2 changed files with 11 additions and 5 deletions

View File

@ -26,10 +26,15 @@
"@id": "urn:solid-server:default:Middleware" "@id": "urn:solid-server:default:Middleware"
}, },
{ {
"@id": "urn:solid-server:default:PodManagerHandler" "@type": "WaterfallHandler",
}, "WaterfallHandler:_handlers": [
{ {
"@id": "urn:solid-server:default:LdpHandler" "@id": "urn:solid-server:default:PodManagerHandler"
},
{
"@id": "urn:solid-server:default:LdpHandler"
}
]
} }
] ]
} }

View File

@ -5,6 +5,7 @@ import { HttpHandler } from '../../src/server/HttpHandler';
import type { HttpRequest } from '../../src/server/HttpRequest'; import type { HttpRequest } from '../../src/server/HttpRequest';
import type { HttpResponse } from '../../src/server/HttpResponse'; import type { HttpResponse } from '../../src/server/HttpResponse';
import { instantiateFromConfig } from '../configs/Util'; import { instantiateFromConfig } from '../configs/Util';
import { StaticAsyncHandler } from '../util/StaticAsyncHandler';
const port = 6002; const port = 6002;
@ -21,7 +22,7 @@ describe('An Express server with middleware', (): void => {
beforeAll(async(): Promise<void> => { beforeAll(async(): Promise<void> => {
const factory = await instantiateFromConfig( const factory = await instantiateFromConfig(
'urn:solid-server:default:ExpressHttpServerFactory', 'middleware.json', { '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:LdpHandler': new SimpleHttpHandler(),
'urn:solid-server:default:variable:port': port, 'urn:solid-server:default:variable:port': port,
'urn:solid-server:default:variable:baseUrl': 'https://example.pod/', 'urn:solid-server:default:variable:baseUrl': 'https://example.pod/',