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: Create container data before adding content-type

Browse Source
This commit is contained in:
Joachim Van Herwegen 2020-12-02 14:03:16 +01:00
parent 82393ed33b
commit c2b189184b
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/storage/DataAccessorBasedStore.ts
View File

@ -1,4 +1,3 @@
import type { Readable } from 'stream';
import { DataFactory } from 'n3'; import { DataFactory } from 'n3';
import type { Quad } from 'rdf-js'; import type { Quad } from 'rdf-js';
import { v4 as uuid } from 'uuid'; import { v4 as uuid } from 'uuid';
@ -11,7 +10,6 @@ import { ConflictHttpError } from '../util/errors/ConflictHttpError';
import { MethodNotAllowedHttpError } from '../util/errors/MethodNotAllowedHttpError'; import { MethodNotAllowedHttpError } from '../util/errors/MethodNotAllowedHttpError';
import { NotFoundHttpError } from '../util/errors/NotFoundHttpError'; import { NotFoundHttpError } from '../util/errors/NotFoundHttpError';
import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError'; import { NotImplementedHttpError } from '../util/errors/NotImplementedHttpError';
import type { Guarded } from '../util/GuardedStream';
import { import {
ensureTrailingSlash, ensureTrailingSlash,
getParentContainer, getParentContainer,
@ -68,13 +66,12 @@ export class DataAccessorBasedStore implements ResourceStore {
// Create the representation of a container // Create the representation of a container
if (this.isExistingContainer(metadata)) { if (this.isExistingContainer(metadata)) {
// Generate the data stream before setting the content-type to prevent unnecessary triples
const data = guardedStreamFrom(metadata.quads());
metadata.contentType = INTERNAL_QUADS; metadata.contentType = INTERNAL_QUADS;
result = { result = {
binary: false, binary: false,
get data(): Guarded<Readable> { data,
// This allows other modules to still add metadata before the output data is written
return guardedStreamFrom(result.metadata.quads());
},
metadata, metadata,
}; };

3
test/unit/storage/DataAccessorBasedStore.test.ts
View File

@ -108,9 +108,10 @@ describe('A DataAccessorBasedStore', (): void => {
it('will return a data stream that matches the metadata for containers.', async(): Promise<void> => { it('will return a data stream that matches the metadata for containers.', async(): Promise<void> => {
const resourceID = { path: `${root}container/` }; const resourceID = { path: `${root}container/` };
accessor.data[resourceID.path] = { metadata: containerMetadata } as Representation; accessor.data[resourceID.path] = { metadata: containerMetadata } as Representation;
const metaQuads = containerMetadata.quads();
const result = await store.getRepresentation(resourceID); const result = await store.getRepresentation(resourceID);
expect(result).toMatchObject({ binary: false }); expect(result).toMatchObject({ binary: false });
expect(await arrayifyStream(result.data)).toBeRdfIsomorphic(containerMetadata.quads()); expect(await arrayifyStream(result.data)).toBeRdfIsomorphic(metaQuads);
expect(result.metadata.contentType).toEqual(INTERNAL_QUADS); expect(result.metadata.contentType).toEqual(INTERNAL_QUADS);
}); });
}); });