caldav-adapter 8.2.10 → 8.3.0

package/common/tags.js

@@ -90,18 +90,18 @@ module.exports = function (options) {
       },
       getcontenttype: {
         doc: 'https://tools.ietf.org/html/rfc2518#section-13.5',
-        async resp({ resource }) {
+        async resp({ resource, event }) {
           if (resource === 'calendar') {
             return {
-              [buildTag(dav, 'getcontenttype')]:
-                'text/calendar; charset=utf-8; component=VEVENT'
+              [buildTag(dav, 'getcontenttype')]: 'text/calendar; charset=utf-8'
             };
           }
 
           if (resource === 'event') {
+            const componentType = event?.componentType || 'VEVENT';
             return {
               [buildTag(dav, 'getcontenttype')]:
-                'text/calendar; charset=utf-8; component=VEVENT'
+                `text/calendar; charset=utf-8; component=${componentType}`
             };
           }
         }
@@ -360,9 +360,10 @@ module.exports = function (options) {
           if (resource === 'calendar') {
             return {
               [buildTag(cal, 'supported-calendar-component-set')]: {
-                [buildTag(cal, 'comp')]: {
-                  '@name': 'VEVENT'
-                }
+                [buildTag(cal, 'comp')]: [
+                  { '@name': 'VEVENT' },
+                  { '@name': 'VTODO' }
+                ]
               }
             };
           }

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

package/routes/calendar/calendar/calendar-query.js

@@ -8,10 +8,21 @@ module.exports = function (options) {
   const eventResponse = calEventResponse(options);
   return async function (ctx, calendar) {
     /* https://tools.ietf.org/html/rfc4791#section-9.9 */
-    const filters = xml.get(
+    const veventFilters = xml.get(
       "/CAL:calendar-query/CAL:filter/CAL:comp-filter[@name='VCALENDAR']/CAL:comp-filter[@name='VEVENT']/CAL:time-range",
       ctx.request.xml
     );
+    const vtodoFilters = xml.get(
+      "/CAL:calendar-query/CAL:filter/CAL:comp-filter[@name='VCALENDAR']/CAL:comp-filter[@name='VTODO']/CAL:time-range",
+      ctx.request.xml
+    );
+
+    const filters = veventFilters || vtodoFilters;
+    const componentType = veventFilters
+      ? 'VEVENT'
+      : vtodoFilters
+        ? 'VTODO'
+        : null;
     const { children } = xml.getWithChildren(
       '/CAL:calendar-query/D:prop',
       ctx.request.xml
@@ -25,7 +36,8 @@ module.exports = function (options) {
         principalId: ctx.state.params.principalId,
         calendarId: options.data.getCalendarId(ctx, calendar),
         user: ctx.state.user,
-        fullData
+        fullData,
+        componentType
       });
 
       return eventResponse(ctx, events, calendar, children);
@@ -73,7 +85,8 @@ module.exports = function (options) {
       start,
       end,
       user: ctx.state.user,
-      fullData
+      fullData,
+      componentType
     });
     return eventResponse(ctx, events, calendar, children);
   };

package/routes/principal/get.js

@@ -0,0 +1,27 @@
+const {
+  build,
+  multistatus,
+  response,
+  status,
+  href,
+  buildTag
+} = require('../../common/x-build');
+
+module.exports = function (_options) {
+  return async function (ctx) {
+    // GET requests to principals should return the current user principal
+    // This is what CalDAV clients expect when they follow redirects from root URL
+
+    const principalInfo = [
+      {
+        [buildTag('DAV:', 'current-user-principal')]: href(
+          ctx.state.principalUrl
+        )
+      }
+    ];
+
+    const resps = response(ctx.url, status[200], principalInfo);
+    const ms = multistatus([resps]);
+    return build(ms);
+  };
+};

package/routes/principal/principal.js

@@ -6,6 +6,7 @@ const {
 } = require('../../common/response');
 const winston = require('../../common/winston');
 const routePropfind = require('./propfind');
+const routeGet = require('./get'); // New GET handler
 const routeMkCalendar = require('./mkcalendar');
 // const routeReport = require('./report');
 
@@ -13,7 +14,7 @@ module.exports = function (options) {
   const log = winston({ ...options, label: 'principal' });
   const methods = {
     propfind: routePropfind(options),
-    get: routePropfind(options), // Handle GET same as PROPFIND for redirected requests
+    get: routeGet(options), // Use proper GET handler instead of reusing PROPFIND
     // report: reportReport(opts)
     //
     // TODO: proppatch

package/test/test.js

@@ -6,3 +6,36 @@ const caldavAdapter = require('..');
 test('exports a function', (t) => {
   t.true(typeof caldavAdapter === 'function');
 });
+
+test('VTODO supported component set includes VTODO', (t) => {
+  const options = {
+    data: {
+      getCalendarId: () => 'test',
+      buildICS: () => 'test',
+      getETag: () => 'test'
+    }
+  };
+
+  const { tags } = require('../common/tags')(options);
+  const supportedComponentSetTag =
+    tags['urn:ietf:params:xml:ns:caldav']['supported-calendar-component-set'];
+
+  t.is(typeof supportedComponentSetTag, 'object');
+  t.is(typeof supportedComponentSetTag.resp, 'function');
+});
+
+test('VTODO content type is dynamic based on component', (t) => {
+  const options = {
+    data: {
+      getCalendarId: () => 'test',
+      buildICS: () => 'test',
+      getETag: () => 'test'
+    }
+  };
+
+  const { tags } = require('../common/tags')(options);
+  const contentTypeTag = tags['DAV:'].getcontenttype;
+
+  t.is(typeof contentTypeTag, 'object');
+  t.is(typeof contentTypeTag.resp, 'function');
+});