caldav-adapter 8.1.0 → 8.2.1

package/common/x-build.js

@@ -62,8 +62,13 @@ const status = {
 };
 module.exports.status = status;
 
-function response(url, status, props) {
+function response(url, status, props, deleted) {
   const res = href(url);
+  if (deleted) {
+    res[buildTag('DAV:', 'status')] = status;
+    return res;
+  }
+
   res[buildTag('DAV:', 'propstat')] = [
     {
       [buildTag('DAV:', 'status')]: status

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.1.0",
+  "version": "8.2.1",
   "author": "Sanders DeNardi and Forward Email LLC",
   "contributors": [
     "Sanders DeNardi <sedenardi@gmail.com> (http://www.sandersdenardi.com/)",

package/routes/calendar/calendar/delete.js

@@ -29,7 +29,10 @@ module.exports = function (options) {
       });
     }
 
-    ctx.status = 200;
+    // fix header otherwise it's got a multi-status response
+    // (e.g. since we call `setMultistatusResponse` before exec())
+    ctx.set('Content-Type', 'text/html; charset="utf-8"');
+    ctx.status = 204; // no content
     ctx.body = '';
   };
 

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

@@ -22,9 +22,27 @@ module.exports = function (options) {
           event
         });
       });
+
+      //
+      // <https://www.rfc-editor.org/rfc/rfc6578.html#page-14:~:text=The%20content%20of%20each%20DAV%3Aresponse%20element%20differs%20depending%20on%20how%0A%20%20%20%20%20%20the%20member%20was%20altered%3A>
+      //
+      //  > For members that have changed (i.e., are new or have had their
+      //  mapped resource modified), the DAV:response MUST contain at
+      //  least one DAV:propstat element and MUST NOT contain any
+      //  DAV:status element.
+
+      //  > For members that have been removed, the DAV:response MUST
+      //  contain one DAV:status with a value set to '404 Not Found' and
+      //  MUST NOT contain any DAV:propstat element.
+      //
       const pRes = await Promise.all(propActions);
       const url = path.join(ctx.url, `${event.eventId}.ics`);
-      const resp = response(url, status[200], _.compact(pRes));
+      const resp = event.deleted_at
+        ? response(url, status[404], [], true)
+        : response(url, status[200], _.compact(pRes));
+
+      // TODO: misses is not used and this condition never occurs
+      //       (artifact from old codebase)
       if (misses.length > 0) {
         resp['D:propstat'].push(missingPropstats(misses));
       }

package/routes/calendar/calendar/sync-collection.js

@@ -19,11 +19,13 @@ module.exports = function (options) {
     const fullData = _.some(children, (child) => {
       return child.localName === 'calendar-data';
     });
+
     const events = await options.data.getEventsForCalendar(ctx, {
       principalId: ctx.state.params.principalId,
       calendarId: options.data.getCalendarId(ctx, calendar),
       user: ctx.state.user,
-      fullData
+      fullData,
+      showDeleted: true
     });
     const { responses } = await eventResponse(ctx, events, calendar, children);