caldav-adapter 8.0.3 → 8.1.0

package/common/parse-body.js

@@ -9,16 +9,18 @@ module.exports = async function (ctx) {
     });
   } catch (err) {
     // <https://github.com/stream-utils/raw-body/blob/f62e660e7c50891844f5615de075ab145c1f6129/README.md?plain=1#L82-L116>
-    if (ctx?.app?.emit) ctx.app.emit('error', err, ctx);
-    else throw err;
+    if (ctx.logger) ctx.logger.warn(err);
+    else if (ctx?.app?.emit) ctx.app.emit('error', err, ctx);
+    else console.warn(err);
   }
 
   if (ctx.request.type.includes('xml')) {
     try {
       ctx.request.xml = new DOMParser().parseFromString(ctx.request.body);
     } catch (err) {
-      if (ctx?.app?.emit) ctx.app.emit('error', err, ctx);
-      else throw err;
+      if (ctx.logger) ctx.logger.warn(err);
+      else if (ctx?.app?.emit) ctx.app.emit('error', err, ctx);
+      else console.warn(err);
     }
   }
 };

package/common/tags.js

@@ -57,11 +57,17 @@ module.exports = function (options) {
             };
           }
 
-          if (resource === 'calendar') {
+          if (resource === 'calendar')
             return {
               [buildTag(dav, 'displayname')]: calendar.name
             };
-          }
+
+          if (resource === 'calendarProppatch')
+            return response(ctx.url, status[200], [
+              {
+                [buildTag(dav, 'displayname')]: calendar.name
+              }
+            ]);
         }
       },
       getcontenttype: {
@@ -230,37 +236,33 @@ module.exports = function (options) {
       'calendar-description': {
         doc: 'https://tools.ietf.org/html/rfc4791#section-5.2.1',
         async resp({ resource, ctx, calendar }) {
-          if (resource === 'calendar') {
+          if (resource === 'calendar')
             return {
-              [buildTag(ical, 'calendar-description')]: calendar.description
+              [buildTag(cal, 'calendar-description')]: calendar.description
             };
-          }
 
-          if (resource === 'calendarProppatch') {
-            return response(ctx.url, status[403], [
+          if (resource === 'calendarProppatch')
+            return response(ctx.url, status[200], [
               {
-                [buildTag(cal, 'calendar-description')]: ''
+                [buildTag(cal, 'calendar-description')]: calendar.description
               }
             ]);
-          }
         }
       },
       'calendar-timezone': {
         doc: 'https://tools.ietf.org/html/rfc4791#section-5.2.2',
         async resp({ resource, ctx, calendar }) {
-          if (resource === 'calendar') {
+          if (resource === 'calendar')
             return {
-              [buildTag(ical, 'calendar-timezone')]: calendar.timezone
+              [buildTag(cal, 'calendar-timezone')]: calendar.timezone
             };
-          }
 
-          if (resource === 'calendarProppatch') {
-            return response(ctx.url, status[403], [
+          if (resource === 'calendarProppatch')
+            return response(ctx.url, status[200], [
               {
-                [buildTag(cal, 'calendar-timezone')]: ''
+                [buildTag(cal, 'calendar-timezone')]: calendar.timezone
               }
             ]);
-          }
         }
       },
       'calendar-user-address-set': {
@@ -351,7 +353,19 @@ module.exports = function (options) {
       },
       'checksum-versions': {},
       'dropbox-home-URL': {},
-      'email-address-set': {},
+      'email-address-set': {
+        async resp({ resource, ctx }) {
+          if (
+            resource === 'calendar' &&
+            (ctx?.state?.user?.email || ctx?.state?.user?.username)
+          ) {
+            return {
+              [buildTag(cs, 'email-address-set')]:
+                ctx?.state?.user?.email || ctx?.state?.user?.username
+            };
+          }
+        }
+      },
       getctag: {
         // DEPRECATED
         doc: 'https://github.com/apple/ccs-calendarserver/blob/master/doc/Extensions/caldav-ctag.txt',
@@ -370,37 +384,37 @@ module.exports = function (options) {
     [ical]: {
       'calendar-color': {
         async resp({ resource, ctx, calendar }) {
-          if (resource === 'calendar') {
+          if (resource === 'calendar')
             return {
               [buildTag(ical, 'calendar-color')]: calendar.color
             };
-          }
 
-          if (resource === 'calendarProppatch') {
-            return response(ctx.url, status[403], [
+          if (resource === 'calendarProppatch')
+            return response(ctx.url, status[200], [
               {
-                [buildTag(ical, 'calendar-color')]: ''
+                [buildTag(ical, 'calendar-color')]: calendar.color
               }
             ]);
-          }
         }
       },
       'calendar-order': {
-        async resp({ resource, ctx }) {
-          if (
-            resource === 'calCollectionProppatch' ||
-            resource === 'calendarProppatch'
-          ) {
-            return response(ctx.url, status[403], [
+        async resp({ resource, ctx, calendar }) {
+          if (resource === 'calendar')
+            return {
+              [buildTag(ical, 'calendar-order')]: calendar.order
+            };
+
+          if (resource === 'calendarProppatch')
+            return response(ctx.url, status[200], [
               {
-                [buildTag(ical, 'calendar-order')]: ''
+                [buildTag(ical, 'calendar-order')]: calendar.order
               }
             ]);
-          }
         }
       }
     }
   };
+
   const getResponse = async ({ resource, child, ctx, calendar, event }) => {
     if (!child.namespaceURI) {
       return null;

package/index.js

@@ -134,11 +134,8 @@ module.exports = function (options) {
     if (
       ctx.url.toLowerCase() === '/.well-known/caldav' &&
       !options.disableWellKnown
-    ) {
-      // Return ctx.redirect(rootRoute);
-      ctx.status = 404;
-      return;
-    }
+    )
+      return ctx.redirect(rootRoute); // TODO: should be 302?
 
     if (!rootRegexp.test(ctx.url)) {
       await next();

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

package/routes/calendar/calendar/proppatch.js

@@ -18,12 +18,73 @@ module.exports = function (options) {
       ctx.request.xml
     );
 
+    const updates = {};
+    for (const child of children) {
+      if (!child.localName || !child.textContent) continue;
+      switch (child.localName) {
+        case 'displayname': {
+          updates.name = child.textContent;
+
+          break;
+        }
+
+        case 'calendar-description': {
+          updates.description = child.textContent;
+
+          break;
+        }
+
+        case 'calendar-timezone': {
+          updates.timezone = child.textContent;
+
+          break;
+        }
+
+        case 'calendar-color': {
+          updates.color = child.textContent;
+
+          break;
+        }
+
+        case 'calendar-order': {
+          updates.order = Number.parseInt(child.textContent, 10);
+
+          break;
+        }
+
+        // TODO: finish me
+
+        // No default
+      }
+    }
+
+    //
+    // if updates was empty then we should log so we can alert admins
+    // as to what other properties clients are attempting to update
+    // (this code is an anti-pattern but temporary so we can improve)
+    //
+    if (_.isEmpty(updates)) {
+      const err = new TypeError('CalDAV PROPPATCH missing fields');
+      err.isCodeBug = true; // Specific to Forward Email (can be removed later)
+      err.str = ctx.request.body; // Sensitive and should be removed later
+      err.xml = ctx.request.xml;
+      console.error(err);
+      if (ctx.logger) ctx.logger.error(err);
+    }
+
+    const updatedCalendar = await options.data.updateCalendar(ctx, {
+      principalId: ctx.state.params.principalId,
+      calendarId: ctx.state.params.calendarId,
+      user: ctx.state.user,
+      updates
+    });
+
     const actions = _.map(children, async (child) => {
       return tags.getResponse({
         resource: 'calendarProppatch',
         child,
         ctx,
-        calendar
+        calendar: updatedCalendar
       });
     });
     const res = await Promise.all(actions);

package/routes/calendar/calendar/put.js

@@ -13,6 +13,12 @@ module.exports = function (options) {
       return;
     }
 
+    // TODO: support XML update (?)
+    // const { children } = xml.getWithChildren(
+    //   '/D:propertyupdate/D:set/D:prop',
+    //   ctx.request.xml
+    // );
+
     if (
       ctx.request.type !== 'text/calendar' ||
       typeof ctx.request.body !== 'string'

package/routes/calendar/calendar.js

@@ -11,7 +11,7 @@ const routerUserPropfind = require('./user/propfind');
 const routerCalPropfind = require('./calendar/propfind');
 const routerCalReport = require('./calendar/report');
 const routerCalGet = require('./calendar/get');
-// const routerCalProppatch = require('./calendar/proppatch');
+const routerCalProppatch = require('./calendar/proppatch');
 const routerCalPut = require('./calendar/put');
 const routerCalDelete = require('./calendar/delete');
 
@@ -25,7 +25,7 @@ module.exports = function (options) {
     propfind: routerCalPropfind(options),
     report: routerCalReport(options),
     get: routerCalGet(options),
-    // proppatch: routerCalProppatch(options),
+    proppatch: routerCalProppatch(options),
     put: routerCalPut(options),
     delete: routerCalDelete(options),
     mkcalendar: routeMkCalendar(options)

package/routes/principal/mkcalendar.js

@@ -31,6 +31,18 @@ module.exports = function (options) {
 
           break;
         }
+
+        case 'calendar-color': {
+          calendar.color = child.textContent;
+
+          break;
+        }
+
+        case 'calendar-order': {
+          calendar.order = Number.parseInt(child.textContent, 10);
+
+          break;
+        }
         // No default
       }
     }