caldav-adapter 8.3.4 → 8.3.6

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "caldav-adapter",
   "description": "CalDAV server for Node.js and Koa. Modernized and maintained for Forward Email.",
-  "version": "8.3.4",
+  "version": "8.3.6",
   "author": "Sanders DeNardi and Forward Email LLC",
   "contributors": [
     "Sanders DeNardi <sedenardi@gmail.com> (http://www.sandersdenardi.com/)",

package/routes/calendar/calendar/event-response.js

@@ -48,6 +48,8 @@ module.exports = function (options) {
       // Priority order:
       // 1. event.href - the original resource path (if stored by the data layer)
       // 2. Constructed from event.eventId - fallback for backwards compatibility
+      //    This fallback produces the same URLs that were returned to clients
+      //    before the href field was added, so it matches what clients cached.
       //
       // See: https://www.rfc-editor.org/rfc/rfc6578.html (sync-collection)
       //

package/test/event-response.test.js

@@ -125,6 +125,37 @@ test('event-response returns 404 status for deleted events', async (t) => {
   t.true(responseObj['D:status'].includes('404'));
 });
 
+test('event-response returns 404 for deleted events without href using fallback URL', async (t) => {
+  const options = createMockOptions();
+  const eventResponse = eventResponseFactory(options);
+  const ctx = createMockCtx('/cal/user/calendar');
+  const calendar = createMockCalendar();
+
+  // Deleted event WITHOUT href - should use fallback URL construction
+  // This is critical for backwards compatibility with events created
+  // before the href field was added
+  const events = [
+    {
+      eventId: 'deleted-event-no-href',
+      deleted_at: new Date(),
+      ical: 'BEGIN:VCALENDAR\nEND:VCALENDAR'
+    }
+  ];
+
+  const children = [];
+
+  const result = await eventResponse(ctx, events, calendar, children);
+
+  t.truthy(result.responses);
+  // Should NOT be skipped - fallback URL construction works for backwards compatibility
+  t.is(result.responses.length, 1);
+
+  const responseObj = result.responses[0];
+  t.is(responseObj['D:href'], '/cal/user/calendar/deleted-event-no-href.ics');
+  t.truthy(responseObj['D:status']);
+  t.true(responseObj['D:status'].includes('404'));
+});
+
 test('event-response uses href for deleted events when available (critical for sync)', async (t) => {
   const options = createMockOptions();
   const eventResponse = eventResponseFactory(options);
@@ -217,11 +248,59 @@ test('event-response handles multiple events correctly', async (t) => {
   // Event 2: uses href
   t.is(result.responses[1]['D:href'], '/cal/user/calendar/custom-path.ics');
 
-  // Event 3: deleted, uses eventId (no href)
+  // Event 3: deleted, uses eventId (no href) - fallback URL construction
   t.is(result.responses[2]['D:href'], '/cal/user/calendar/event3.ics');
   t.true(result.responses[2]['D:status'].includes('404'));
 });
 
+test('event-response handles multiple events with mixed deleted states', async (t) => {
+  const options = createMockOptions();
+  const eventResponse = eventResponseFactory(options);
+  const ctx = createMockCtx('/cal/user/calendar');
+  const calendar = createMockCalendar();
+
+  // Mix of events: active, deleted with href, deleted without href
+  const events = [
+    {
+      eventId: 'active-event',
+      ical: 'BEGIN:VCALENDAR\nEND:VCALENDAR'
+    },
+    {
+      eventId: 'deleted-with-href',
+      href: '/cal/user/calendar/deleted-with-href.ics',
+      deleted_at: new Date(),
+      ical: 'BEGIN:VCALENDAR\nEND:VCALENDAR'
+    },
+    {
+      eventId: 'deleted-no-href',
+      deleted_at: new Date(),
+      ical: 'BEGIN:VCALENDAR\nEND:VCALENDAR'
+    }
+  ];
+
+  const children = [];
+
+  const result = await eventResponse(ctx, events, calendar, children);
+
+  t.truthy(result.responses);
+  // All 3 responses - deleted without href is NO LONGER skipped
+  t.is(result.responses.length, 3);
+
+  // Active event
+  t.is(result.responses[0]['D:href'], '/cal/user/calendar/active-event.ics');
+
+  // Deleted event with href
+  t.is(
+    result.responses[1]['D:href'],
+    '/cal/user/calendar/deleted-with-href.ics'
+  );
+  t.true(result.responses[1]['D:status'].includes('404'));
+
+  // Deleted event without href - uses fallback URL construction
+  t.is(result.responses[2]['D:href'], '/cal/user/calendar/deleted-no-href.ics');
+  t.true(result.responses[2]['D:status'].includes('404'));
+});
+
 test('event-response handles email-like eventId with @ symbol', async (t) => {
   const options = createMockOptions();
   const eventResponse = eventResponseFactory(options);