fix: Keep content-type when using metadata templates

CommunitySolidServer · Feb 14, 2024 · 43a5437 · 43a5437
1 parent a9bcc96
commit 43a5437
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/pods/generate/BaseResourcesGenerator.ts b/src/pods/generate/BaseResourcesGenerator.ts
@@ -197,6 +197,10 @@ export class BaseResourcesGenerator implements TemplatedResourcesGenerator {
     // Add metadata from .meta file if there is one
     if (metaLink) {
       const rawMetadata = await this.generateMetadata(metaLink, options);
+      if (!rawMetadata.contentType) {
+        // Make sure this does not remove the content-type if none is explicitly defined
+        rawMetadata.contentType = metadata.contentType;
+      }
       const metaIdentifier = this.metadataStrategy.getAuxiliaryIdentifier(link.identifier);
       const descriptionMeta = new RepresentationMetadata(metaIdentifier);
       addResourceMetadata(rawMetadata, isContainerIdentifier(link.identifier));

diff --git a/test/unit/pods/generate/BaseResourcesGenerator.test.ts b/test/unit/pods/generate/BaseResourcesGenerator.test.ts
@@ -10,6 +10,7 @@ import { asyncToArray } from '../../../../src/util/IterableUtil';
 import { ensureTrailingSlash, joinFilePath, trimTrailingSlashes } from '../../../../src/util/PathUtil';
 import { readableToQuads, readableToString } from '../../../../src/util/StreamUtil';
 import { HandlebarsTemplateEngine } from '../../../../src/util/templates/HandlebarsTemplateEngine';
+import { CONTENT_TYPE_TERM } from '../../../../src/util/Vocabularies';
 import { SimpleSuffixStrategy } from '../../../util/SimpleSuffixStrategy';
 import { mockFileSystem } from '../../../util/Util';
 
@@ -144,6 +145,10 @@ describe('A BaseResourcesGenerator', (): void => {
     const expDocMetadataQuads = docMetadataQuads.getQuads(docMetadata.identifier, 'pre:has', null, null);
     expect(expDocMetadataQuads).toHaveLength(1);
     expect(expDocMetadataQuads[0].object.value).toBe('metadata');
+    // Metadata will replace existing metadata so need to make sure content-type is still there
+    const contentDocMetadataQuads = docMetadataQuads.getQuads(docMetadata.identifier, CONTENT_TYPE_TERM, null, null);
+    expect(contentDocMetadataQuads).toHaveLength(1);
+    expect(contentDocMetadataQuads[0].object.value).toBe('text/turtle');
   });
 
   it('does not create container when it already exists.', async(): Promise<void> => {