fix: Ensure the ETag is representation specific

test/unit/http/ldp/GetOperationHandler.test.ts

@@ -1,10 +1,13 @@
+import type { Readable } from 'stream';
 import { GetOperationHandler } from '../../../../src/http/ldp/GetOperationHandler';
 import type { Operation } from '../../../../src/http/Operation';
 import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation';
 import type { Representation } from '../../../../src/http/representation/Representation';
+import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata';
 import { BasicConditions } from '../../../../src/storage/BasicConditions';
 import type { ResourceStore } from '../../../../src/storage/ResourceStore';
 import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError';
+import { NotModifiedHttpError } from '../../../../src/util/errors/NotModifiedHttpError';
 
 describe('A GetOperationHandler', (): void => {
   let operation: Operation;
@@ -13,12 +16,15 @@ describe('A GetOperationHandler', (): void => {
   const body = new BasicRepresentation();
   let store: ResourceStore;
   let handler: GetOperationHandler;
+  let data: Readable;
+  const metadata = new RepresentationMetadata();
 
   beforeEach(async(): Promise<void> => {
     operation = { method: 'GET', target: { path: 'http://test.com/foo' }, preferences, conditions, body };
+    data = { destroy: jest.fn() } as any;
     store = {
       getRepresentation: jest.fn(async(): Promise<Representation> =>
-        ({ binary: false, data: 'data', metadata: 'metadata' } as any)),
+        ({ binary: false, data, metadata } as any)),
     } as unknown as ResourceStore;
 
     handler = new GetOperationHandler(store);
@@ -33,9 +39,17 @@ describe('A GetOperationHandler', (): void => {
   it('returns the representation from the store with the correct response.', async(): Promise<void> => {
     const result = await handler.handle({ operation });
     expect(result.statusCode).toBe(200);
-    expect(result.metadata).toBe('metadata');
-    expect(result.data).toBe('data');
+    expect(result.metadata).toBe(metadata);
+    expect(result.data).toBe(data);
     expect(store.getRepresentation).toHaveBeenCalledTimes(1);
     expect(store.getRepresentation).toHaveBeenLastCalledWith(operation.target, preferences, conditions);
   });
+
+  it('returns a 304 if the conditions do not match.', async(): Promise<void> => {
+    operation.conditions = {
+      matchesMetadata: (): boolean => false,
+    };
+    await expect(handler.handle({ operation })).rejects.toThrow(NotModifiedHttpError);
+    expect(data.destroy).toHaveBeenCalledTimes(1);
+  });
 });

test/unit/http/ldp/HeadOperationHandler.test.ts

@@ -3,9 +3,11 @@ import { HeadOperationHandler } from '../../../../src/http/ldp/HeadOperationHand
 import type { Operation } from '../../../../src/http/Operation';
 import { BasicRepresentation } from '../../../../src/http/representation/BasicRepresentation';
 import type { Representation } from '../../../../src/http/representation/Representation';
+import { RepresentationMetadata } from '../../../../src/http/representation/RepresentationMetadata';
 import { BasicConditions } from '../../../../src/storage/BasicConditions';
 import type { ResourceStore } from '../../../../src/storage/ResourceStore';
 import { NotImplementedHttpError } from '../../../../src/util/errors/NotImplementedHttpError';
+import { NotModifiedHttpError } from '../../../../src/util/errors/NotModifiedHttpError';
 
 describe('A HeadOperationHandler', (): void => {
   let operation: Operation;
@@ -15,13 +17,14 @@ describe('A HeadOperationHandler', (): void => {
   let store: ResourceStore;
   let handler: HeadOperationHandler;
   let data: Readable;
+  const metadata = new RepresentationMetadata();
 
   beforeEach(async(): Promise<void> => {
     operation = { method: 'HEAD', target: { path: 'http://test.com/foo' }, preferences, conditions, body };
     data = { destroy: jest.fn() } as any;
     store = {
       getRepresentation: jest.fn(async(): Promise<Representation> =>
-        ({ binary: false, data, metadata: 'metadata' } as any)),
+        ({ binary: false, data, metadata } as any)),
     } as any;
 
     handler = new HeadOperationHandler(store);
@@ -38,10 +41,18 @@ describe('A HeadOperationHandler', (): void => {
   it('returns the representation from the store with the correct response.', async(): Promise<void> => {
     const result = await handler.handle({ operation });
     expect(result.statusCode).toBe(200);
-    expect(result.metadata).toBe('metadata');
+    expect(result.metadata).toBe(metadata);
     expect(result.data).toBeUndefined();
     expect(data.destroy).toHaveBeenCalledTimes(1);
     expect(store.getRepresentation).toHaveBeenCalledTimes(1);
     expect(store.getRepresentation).toHaveBeenLastCalledWith(operation.target, preferences, conditions);
   });
+
+  it('returns a 304 if the conditions do not match.', async(): Promise<void> => {
+    operation.conditions = {
+      matchesMetadata: (): boolean => false,
+    };
+    await expect(handler.handle({ operation })).rejects.toThrow(NotModifiedHttpError);
+    expect(data.destroy).toHaveBeenCalledTimes(2);
+  });
 });

test/unit/http/output/metadata/ModifiedMetadataWriter.test.ts

@@ -2,21 +2,22 @@ import { createResponse } from 'node-mocks-http';
 import { ModifiedMetadataWriter } from '../../../../../src/http/output/metadata/ModifiedMetadataWriter';
 import { RepresentationMetadata } from '../../../../../src/http/representation/RepresentationMetadata';
 import type { HttpResponse } from '../../../../../src/server/HttpResponse';
+import { getETag } from '../../../../../src/storage/Conditions';
 import { updateModifiedDate } from '../../../../../src/util/ResourceUtil';
-import { DC } from '../../../../../src/util/Vocabularies';
+import { CONTENT_TYPE, DC } from '../../../../../src/util/Vocabularies';
 
 describe('A ModifiedMetadataWriter', (): void => {
   const writer = new ModifiedMetadataWriter();
 
   it('adds the Last-Modified and ETag header if there is dc:modified metadata.', async(): Promise<void> => {
     const response = createResponse() as HttpResponse;
-    const metadata = new RepresentationMetadata();
+    const metadata = new RepresentationMetadata({ [CONTENT_TYPE]: 'text/turtle' });
     updateModifiedDate(metadata);
     const dateTime = metadata.get(DC.terms.modified)!.value;
     await expect(writer.handle({ response, metadata })).resolves.toBeUndefined();
     expect(response.getHeaders()).toEqual({
       'last-modified': new Date(dateTime).toUTCString(),
-      etag: `"${new Date(dateTime).getTime()}"`,
+      etag: getETag(metadata),
     });
   });