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

fix: Keep container metadata when returning index.html representation

Browse Source
This commit is contained in:
Joachim Van Herwegen 2021-07-19 13:50:25 +02:00 committed by Ruben Verborgh
parent 232a47d294
commit aec92dd1c3
2 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/storage/IndexRepresentationStore.ts
View File

@ -41,7 +41,19 @@ export class IndexRepresentationStore extends PassthroughStore {
if (isContainerIdentifier(identifier) && this.matchesPreferences(preferences)) {
try {
const indexIdentifier = { path: `${identifier.path}${this.indexName}` };
return await this.source.getRepresentation(indexIdentifier, preferences, conditions);
const index = await this.source.getRepresentation(indexIdentifier, preferences, conditions);
// We only care about the container metadata so preferences don't matter
const container = await this.source.getRepresentation(identifier, {}, conditions);
container.data.destroy();
// Uses the container metadata but with the index content-type.
// There is potential metadata loss if there is more representation-specific metadata,
// but that can be looked into once the issues above are resolved.
const { contentType } = index.metadata;
index.metadata = container.metadata;
index.metadata.contentType = contentType;
return index;
} catch (error: unknown) {
if (!NotFoundHttpError.isInstance(error)) {
throw error;

21
test/unit/storage/IndexRepresentationstore.test.ts
View File

@ -16,10 +16,10 @@ describe('An IndexRepresentationStore', (): void => {
source = {
getRepresentation: jest.fn((identifier: ResourceIdentifier): any => {
if (identifier.path === `${baseUrl}index.html`) {
return new BasicRepresentation('index data', 'text/html');
return new BasicRepresentation('index data', identifier, 'text/html');
}
if (identifier.path.endsWith('/')) {
return new BasicRepresentation('container data', 'text/turtle');
return new BasicRepresentation('container data', identifier, 'text/turtle');
}
throw new NotFoundHttpError();
}),
@ -36,7 +36,13 @@ describe('An IndexRepresentationStore', (): void => {
it('retrieves the index resource if it exists.', async(): Promise<void> => {
const result = await store.getRepresentation({ path: baseUrl }, {});
await expect(readableToString(result.data)).resolves.toBe('index data');
expect(source.getRepresentation).toHaveBeenCalledTimes(1);
expect(source.getRepresentation).toHaveBeenCalledTimes(2);
expect(source.getRepresentation).toHaveBeenCalledWith({ path: `${baseUrl}index.html` }, {}, undefined);
expect(source.getRepresentation).toHaveBeenLastCalledWith({ path: baseUrl }, {}, undefined);
// Use correct metadata
expect(result.metadata.identifier.value).toBe(baseUrl);
expect(result.metadata.contentType).toBe('text/html');
});
it('errors if a non-404 error was thrown when accessing the index resource.', async(): Promise<void> => {
@ -69,7 +75,12 @@ describe('An IndexRepresentationStore', (): void => {
const preferences = { type: { 'text/turtle': 0.8, 'text/html': 0.5 }};
const result = await store.getRepresentation({ path: baseUrl }, preferences);
await expect(readableToString(result.data)).resolves.toBe('index data');
expect(source.getRepresentation).toHaveBeenCalledTimes(1);
expect(source.getRepresentation).toHaveBeenLastCalledWith({ path: `${baseUrl}base.html` }, preferences, undefined);
expect(source.getRepresentation).toHaveBeenCalledTimes(2);
expect(source.getRepresentation).toHaveBeenCalledWith({ path: `${baseUrl}base.html` }, preferences, undefined);
expect(source.getRepresentation).toHaveBeenLastCalledWith({ path: baseUrl }, {}, undefined);
// Use correct metadata
expect(result.metadata.identifier.value).toBe(baseUrl);
expect(result.metadata.contentType).toBe('text/html');
});
});