Mirroristas/CommunitySolidServer
2
0
Fork 0
mirror of https://github.com/CommunitySolidServer/CommunitySolidServer.git synced 2024-10-03 14:55:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Replace RedirectAllHttpHandler usage with RedirectingHttpHandler

Browse Source
This commit is contained in:
Joachim Van Herwegen
2022-04-21 11:26:47 +02:00
parent 89eeb52b01
commit d2bc995272
7 changed files with 37 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
test/unit/server/util/RedirectAllHttpHandler.test.ts
View File

@@ -1,53 +0,0 @@
import type { TargetExtractor } from '../../../../src/http/input/identifier/TargetExtractor';
import type { ResponseWriter } from '../../../../src/http/output/ResponseWriter';
import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier';
import type { HttpRequest } from '../../../../src/server/HttpRequest';
import type { HttpResponse } from '../../../../src/server/HttpResponse';
import { RedirectAllHttpHandler } from '../../../../src/server/util/RedirectAllHttpHandler';
import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError';
import { joinUrl } from '../../../../src/util/PathUtil';
import { SOLID_HTTP } from '../../../../src/util/Vocabularies';
describe('A RedirectAllHttpHandler', (): void => {
const baseUrl = 'http://test.com/';
const target = '/foo';
const absoluteTarget = 'http://test.com/foo';
let request: HttpRequest;
const response: HttpResponse = {} as any;
let targetExtractor: jest.Mocked<TargetExtractor>;
let responseWriter: jest.Mocked<ResponseWriter>;
let handler: RedirectAllHttpHandler;
beforeEach(async(): Promise<void> => {
request = { url: '/foo' } as any;
targetExtractor = {
handleSafe: jest.fn(({ request: req }): ResourceIdentifier => ({ path: joinUrl(baseUrl, req.url!) })),
} as any;
responseWriter = { handleSafe: jest.fn() } as any;
handler = new RedirectAllHttpHandler({ baseUrl, target, targetExtractor, responseWriter });
});
it('rejects requests for the target.', async(): Promise<void> => {
request.url = target;
await expect(handler.canHandle({ request, response })).rejects.toThrow(NotImplementedHttpError);
});
it('accepts all other requests.', async(): Promise<void> => {
request.url = '/otherPath';
await expect(handler.canHandle({ request, response })).resolves.toBeUndefined();
});
it('writes out a redirect response.', async(): Promise<void> => {
await expect(handler.handle({ request, response })).resolves.toBeUndefined();
expect(responseWriter.handleSafe).toHaveBeenCalledTimes(1);
expect(responseWriter.handleSafe).toHaveBeenLastCalledWith({
response,
result: expect.objectContaining({ statusCode: 302 }),
});
const { metadata } = responseWriter.handleSafe.mock.calls[0][0].result;
expect(metadata?.get(SOLID_HTTP.terms.location)?.value).toBe(absoluteTarget);
});
});

16
test/unit/server/RedirectingHttpHandler.test.ts → test/unit/server/util/RedirectingHttpHandler.test.ts
View File

@@ -1,11 +1,11 @@
import type { TargetExtractor } from '../../../src/http/input/identifier/TargetExtractor';
import type { ResponseWriter } from '../../../src/http/output/ResponseWriter';
import type { ResourceIdentifier } from '../../../src/http/representation/ResourceIdentifier';
import type { HttpRequest } from '../../../src/server/HttpRequest';
import type { HttpResponse } from '../../../src/server/HttpResponse';
import { RedirectingHttpHandler } from '../../../src/server/RedirectingHttpHandler';
import { joinUrl } from '../../../src/util/PathUtil';
import { SOLID_HTTP } from '../../../src/util/Vocabularies';
import type { TargetExtractor } from '../../../../src/http/input/identifier/TargetExtractor';
import type { ResponseWriter } from '../../../../src/http/output/ResponseWriter';
import type { ResourceIdentifier } from '../../../../src/http/representation/ResourceIdentifier';
import type { HttpRequest } from '../../../../src/server/HttpRequest';
import type { HttpResponse } from '../../../../src/server/HttpResponse';
import { RedirectingHttpHandler } from '../../../../src/server/util/RedirectingHttpHandler';
import { joinUrl } from '../../../../src/util/PathUtil';
import { SOLID_HTTP } from '../../../../src/util/Vocabularies';
describe('A RedirectingHttpHandler', (): void => {
const baseUrl = 'http://test.com/';