caldav-adapter 6.0.0 → 6.0.1

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": "6.0.0",
+  "version": "6.0.1",
   "author": "Sanders DeNardi and Forward Email LLC",
   "contributors": [
     "Sanders DeNardi <sedenardi@gmail.com> (http://www.sandersdenardi.com/)",
@@ -10,6 +10,7 @@
   "dependencies": {
     "@xmldom/xmldom": "^0.8.10",
     "basic-auth": "^2.0.1",
+    "ical.js": "^1.5.0",
     "lodash": "^4.17.21",
     "moment": "^2.30.1",
     "path-to-regexp": "^6.2.1",

package/routes/calendar/calendar/put.js

@@ -1,3 +1,4 @@
+const ICAL = require('ical.js');
 const { notFound, preconditionFail } = require('../../../common/x-build');
 const { setMissingMethod } = require('../../../common/response');
 const winston = require('../../../common/winston');
@@ -12,12 +13,6 @@ module.exports = function (options) {
       return;
     }
 
-    if (!ctx.state.params.eventId) {
-      log.warn('eventId param not present');
-      ctx.body = notFound(ctx.url); // Make more meaningful
-      return;
-    }
-
     if (
       ctx.request.type !== 'text/calendar' ||
       typeof ctx.request.body !== 'string'
@@ -27,6 +22,31 @@ module.exports = function (options) {
       return;
     }
 
+    if (!ctx.state.params.eventId) {
+      try {
+        const parsed = ICAL.parse(ctx.request.body);
+        if (!parsed || parsed.length === 0) {
+          const err = new TypeError('ICAL.parse was not successful');
+          err.parsed = parsed;
+          throw err;
+        }
+
+        const comp = new ICAL.Component(parsed);
+        if (!comp) throw new TypeError('ICAL.Component was not successful');
+        const vevent = comp.getFirstSubcomponent('vevent');
+        if (!vevent)
+          throw new TypeError('comp.getFirstSubcomponent was not successful');
+        const uid = vevent.getFirstPropertyValue('uid');
+        if (!uid || typeof uid !== 'string')
+          throw new TypeError('VEVENT missing UID');
+        ctx.state.params.eventId = uid;
+      } catch (err) {
+        log.warn(err);
+        ctx.body = notFound(ctx.url); // Make more meaningful
+        return;
+      }
+    }
+
     const existing = await options.data.getEvent(ctx, {
       eventId: ctx.state.params.eventId,
       principalId: ctx.state.params.principalId,