fix: normalize Date handling in generateETag

Author: larryrider

src/utils/webdav.utils.ts

@@ -111,8 +111,8 @@ export class WebDavUtils {
     await DriveItemRepository.instance.delete([driveItem.uuid]);
   }
 
-  static generateETag(parts: Array<string | number | Date | null | undefined>): string {
-    const normalized = parts.map((part) => (part instanceof Date ? part.getTime() : (part ?? '')));
+  static generateETag(parts: Array<string | number | null | undefined>): string {
+    const normalized = parts.map((part) => part ?? '-');
     const hash = createHash('sha256').update(normalized.join('|')).digest('hex');
     return `"${hash}"`;
   }
@@ -121,10 +121,10 @@ export class WebDavUtils {
     return this.generateETag([
       driveItem.uuid,
       driveItem.itemType === 'file' ? driveItem.size : undefined,
-      driveItem.createdAt,
-      driveItem.updatedAt,
-      driveItem.creationTime,
-      driveItem.modificationTime,
+      driveItem.createdAt.getTime(),
+      driveItem.updatedAt.getTime(),
+      driveItem.creationTime.getTime(),
+      driveItem.modificationTime.getTime(),
     ]);
   }
 }

test/utils/webdav.utils.test.ts

@@ -169,8 +169,8 @@ describe('Webdav utils', () => {
   describe('generateETag', () => {
     test('when the same parts are given, then the same etag is generated', () => {
       const date = new Date('2024-03-04T15:11:01.000Z');
-      const etag1 = WebDavUtils.generateETag(['uuid-1', 100, date]);
-      const etag2 = WebDavUtils.generateETag(['uuid-1', 100, date]);
+      const etag1 = WebDavUtils.generateETag(['uuid-1', 100, date.getTime()]);
+      const etag2 = WebDavUtils.generateETag(['uuid-1', 100, date.getTime()]);
 
       expect(etag1).to.be.equal(etag2);
     });
@@ -184,16 +184,18 @@ describe('Webdav utils', () => {
 
     test('when any part differs, then a different etag is generated', () => {
       const date = new Date('2024-03-04T15:11:01.000Z');
-      const baseEtag = WebDavUtils.generateETag(['uuid-1', 100, date]);
+      const baseEtag = WebDavUtils.generateETag(['uuid-1', 100, date.getTime()]);
 
-      expect(WebDavUtils.generateETag(['uuid-2', 100, date])).to.not.be.equal(baseEtag);
-      expect(WebDavUtils.generateETag(['uuid-1', 200, date])).to.not.be.equal(baseEtag);
-      expect(WebDavUtils.generateETag(['uuid-1', 100, new Date('2024-03-04T15:11:02.000Z')])).to.not.be.equal(baseEtag);
+      expect(WebDavUtils.generateETag(['uuid-2', 100, date.getTime()])).to.not.be.equal(baseEtag);
+      expect(WebDavUtils.generateETag(['uuid-1', 200, date.getTime()])).to.not.be.equal(baseEtag);
+      expect(WebDavUtils.generateETag(['uuid-1', 100, new Date('2024-03-04T15:11:02.000Z').getTime()])).to.not.be.equal(
+        baseEtag,
+      );
     });
 
     test('when a Date is given, then it is normalized using its timestamp', () => {
       const date = new Date('2024-03-04T15:11:01.000Z');
-      const etagFromDate = WebDavUtils.generateETag(['uuid-1', date]);
+      const etagFromDate = WebDavUtils.generateETag(['uuid-1', date.getTime()]);
       const etagFromTimestamp = WebDavUtils.generateETag(['uuid-1', date.getTime()]);
 
       expect(etagFromDate).to.be.equal(etagFromTimestamp);