caldav-adapter 7.0.5 → 7.1.0

package/.github/workflows/ci.yml

@@ -13,9 +13,9 @@ jobs:
           - 18
     name: Node ${{ matrix.node_version }} on ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node_version }}
       - name: Install dependencies

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

package/routes/calendar/calendar/delete.js

@@ -1,38 +1,34 @@
-const { notFound } = require('../../../common/x-build');
 const { setMissingMethod } = require('../../../common/response');
-const winston = require('../../../common/winston');
 
 /* https://tools.ietf.org/html/rfc2518#section-8.6 */
 module.exports = function (options) {
-  const log = winston({ ...options, label: 'calendar/delete' });
   const exec = async function (ctx, calendar) {
     if (calendar.readonly) {
       setMissingMethod(ctx);
       return;
     }
 
-    if (!ctx.state.params.eventId) {
-      log.warn('eventId param not present');
-      ctx.body = notFound(ctx.url); // Make more meaningful
-      return;
+    //
+    // if event id not specified this indicates we're deleting
+    // an entire calendar so we need to delete all events for it as well in this logic
+    //
+    if (ctx.state.params.eventId) {
+      await options.data.deleteEvent(ctx, {
+        eventId: ctx.state.params.eventId,
+        principalId: ctx.state.params.principalId,
+        calendarId: ctx.state.params.calendarId,
+        user: ctx.state.user,
+        calendar
+      });
+    } else {
+      await options.data.deleteCalendar(ctx, {
+        principalId: ctx.state.params.principalId,
+        calendarId: ctx.state.params.calendarId,
+        user: ctx.state.user,
+        calendar
+      });
     }
 
-    const existing = await options.data.getEvent(ctx, {
-      eventId: ctx.state.params.eventId,
-      principalId: ctx.state.params.principalId,
-      calendarId: ctx.state.params.calendarId,
-      user: ctx.state.user,
-      fullData: false
-    });
-    log.debug(`existing event${existing ? '' : ' not'} found`);
-
-    await options.data.deleteEvent(ctx, {
-      eventId: ctx.state.params.eventId,
-      principalId: ctx.state.params.principalId,
-      calendarId: ctx.state.params.calendarId,
-      user: ctx.state.user
-    });
-
     ctx.status = 200;
     ctx.body = '';
   };

package/routes/calendar/calendar/get.js

@@ -14,19 +14,18 @@ module.exports = function (options) {
         fullData: true
       });
 
-      if (ctx.accepts('xml')) {
-        const ics = await options.data.buildICS(ctx, events, calendar);
-        return response(ctx.url, status[200], [
-          {
-            'D:getetag': options.data.getETag(ctx, calendar)
-          },
-          {
-            'CAL:calendar-data': ics
-          }
-        ]);
-      }
+      if (ctx.accepts('text/calendar'))
+        return options.data.buildICS(ctx, events, calendar);
 
-      return options.data.buildICS(ctx, events, calendar);
+      const ics = await options.data.buildICS(ctx, events, calendar);
+      return response(ctx.url, status[200], [
+        {
+          'D:getetag': options.data.getETag(ctx, calendar)
+        },
+        {
+          'CAL:calendar-data': ics
+        }
+      ]);
     }
 
     const event = await options.data.getEvent(ctx, {
@@ -42,21 +41,20 @@ module.exports = function (options) {
       return;
     }
 
-    if (ctx.accepts('xml')) {
-      const ics = await options.data.buildICS(ctx, event, calendar);
-      return response(ctx.url, status[200], [
-        {
-          // TODO: should E-Tag here be of calendar or event?
-          // 'D:getetag': options.data.getETag(ctx, calendar)
-          'D:getetag': options.data.getETag(ctx, calendar)
-        },
-        {
-          'CAL:calendar-data': ics
-        }
-      ]);
-    }
-
-    return options.data.buildICS(ctx, event, calendar);
+    if (ctx.accepts('text/calendar'))
+      return options.data.buildICS(ctx, event, calendar);
+
+    const ics = await options.data.buildICS(ctx, event, calendar);
+    return response(ctx.url, status[200], [
+      {
+        // TODO: should E-Tag here be of calendar or event?
+        // 'D:getetag': options.data.getETag(ctx, calendar)
+        'D:getetag': options.data.getETag(ctx, calendar)
+      },
+      {
+        'CAL:calendar-data': ics
+      }
+    ]);
   };
 
   return {