caldav-adapter 7.0.6 → 7.2.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.6",
+  "version": "7.2.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.js

@@ -1,6 +1,7 @@
 const { notFound } = require('../../common/x-build');
 const { setMultistatusResponse, setOptions } = require('../../common/response');
 const winston = require('../../common/winston');
+const routeMkCalendar = require('../principal/mkcalendar');
 const routerUserPropfind = require('./user/propfind');
 // const routerUserProppatch = require('./user/proppatch');
 const routerCalPropfind = require('./calendar/propfind');
@@ -22,7 +23,8 @@ module.exports = function (options) {
     get: routerCalGet(options),
     // proppatch: routerCalProppatch(opts),
     put: routerCalPut(options),
-    delete: routerCalDelete(options)
+    delete: routerCalDelete(options),
+    mkcalendar: routeMkCalendar(options)
   };
 
   return async function (ctx) {
@@ -46,7 +48,7 @@ module.exports = function (options) {
         return;
       }
 
-      if (!calendar) {
+      if (!calendar && method !== 'mkcalendar') {
         log.warn(`calendar not found: ${calendarId}`);
         ctx.body = notFound(ctx.url);
         return;
@@ -58,9 +60,13 @@ module.exports = function (options) {
         return;
       }
 
-      const body = await calMethods[method].exec(ctx, calendar);
-      if (body) {
-        ctx.body = body;
+      if (typeof calMethods[method].exec === 'function') {
+        ctx.body = await calMethods[method].exec(ctx, calendar);
+      } else if (typeof calMethods[method] === 'function') {
+        ctx.body = await calMethods[method](ctx, calendar);
+      } else {
+        log.warn(`method handler not found: ${method}`);
+        ctx.body = notFound(ctx.url);
       }
     } else {
       if (method === 'options') {
@@ -74,7 +80,14 @@ module.exports = function (options) {
         return;
       }
 
-      ctx.body = await userMethods[method].exec(ctx);
+      if (typeof userMethods[method].exec === 'function') {
+        ctx.body = await userMethods[method].exec(ctx);
+      } else if (typeof userMethods[method] === 'function') {
+        ctx.body = await userMethods[method](ctx);
+      } else {
+        log.warn(`method handler not found: ${method}`);
+        ctx.body = notFound(ctx.url);
+      }
     }
   };
 };