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: Handle JSON preferences correctly in dynamic converter

Browse Source
This commit is contained in:
Joachim Van Herwegen
2021-11-05 14:12:49 +01:00
parent c6544fac1d
commit 4d319d2564
2 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/storage/conversion/DynamicJsonToTemplateConverter.ts
View File

@@ -24,6 +24,8 @@ import type { RepresentationConverterArgs } from './RepresentationConverter';
* describing the content-type of that template.
*
* The output of the result depends on the content-type matched with the template.
* In case JSON is the most preferred output type,
* the input representation will be returned unless a JSON template is defined.
*/
export class DynamicJsonToTemplateConverter extends RepresentationConverter {
private readonly templateEngine: TemplateEngine;
@@ -51,6 +53,11 @@ export class DynamicJsonToTemplateConverter extends RepresentationConverter {
const typeMap = this.constructTypeMap(identifier, representation);
const type = this.findType(typeMap, preferences.type);
// No conversion needed if JSON is requested and there is no specific JSON template
if (type === APPLICATION_JSON && typeMap[APPLICATION_JSON].length === 0) {
return representation;
}
const json = JSON.parse(await readableToString(representation.data));
const rendered = await this.templateEngine.render(json, { templateFile: typeMap[type] });
@@ -69,6 +76,11 @@ export class DynamicJsonToTemplateConverter extends RepresentationConverter {
.map((quad): Term => quad.object)
.filter((term: Term): boolean => term.termType === 'NamedNode') as NamedNode[];
// This handler should only cover cases where templates are defined
if (templates.length === 0) {
throw new NotImplementedHttpError('No templates found.');
}
// Maps all content-types to their template
const typeMap: Record<string, string> = {};
for (const template of templates) {
@@ -77,6 +89,12 @@ export class DynamicJsonToTemplateConverter extends RepresentationConverter {
typeMap[type] = template.value;
}
}
// Not using a template is always an option unless there is a specific JSON template
if (!typeMap[APPLICATION_JSON]) {
typeMap[APPLICATION_JSON] = '';
}
return typeMap;
}