caldav-adapter 6.1.0 → 7.0.1

package/common/tags.js

@@ -1,3 +1,4 @@
+const { isEmail } = require('validator');
 const { buildTag, href, response, status } = require('./x-build');
 const winston = require('./winston');
 
@@ -255,7 +256,24 @@ module.exports = function (options) {
         }
       },
       'calendar-user-address-set': {
-        doc: 'https://tools.ietf.org/html/rfc6638#section-2.4.1'
+        doc: 'https://tools.ietf.org/html/rfc6638#section-2.4.1',
+        async resp({ ctx }) {
+          if (isEmail(ctx.state.user.principalName))
+            return {
+              [buildTag(cal, 'calendar-user-address-set')]: href(
+                `mailto:${ctx.state.user.principalName}`
+              )
+            };
+          if (isEmail(ctx.state.user.email))
+            return {
+              [buildTag(cal, 'calendar-user-address-set')]: href(
+                `mailto:${ctx.state.user.email}`
+              )
+            };
+          return {
+            [buildTag(cal, 'calendar-user-address-set')]: ''
+          };
+        }
       },
       'default-alarm-vevent-date': {
         doc: 'https://tools.ietf.org/id/draft-daboo-valarm-extensions-01.html#rfc.section.9',

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.1.0",
+  "version": "7.0.1",
   "author": "Sanders DeNardi and Forward Email LLC",
   "contributors": [
     "Sanders DeNardi <sedenardi@gmail.com> (http://www.sandersdenardi.com/)",
@@ -14,6 +14,7 @@
     "moment": "^2.30.1",
     "path-to-regexp": "^6.2.1",
     "raw-body": "^2.5.2",
+    "validator": "^13.12.0",
     "winston": "^3.11.0",
     "xmlbuilder2": "^3.1.1",
     "xpath": "0.0.34"

package/routes/calendar/calendar/put.js

@@ -1,4 +1,5 @@
-const { notFound, preconditionFail } = require('../../../common/x-build');
+const { notFound } = require('../../../common/x-build');
+// const { notFound, preconditionFail } = require('../../../common/x-build');
 const { setMissingMethod } = require('../../../common/response');
 const winston = require('../../../common/winston');
 
@@ -46,12 +47,14 @@ module.exports = function (options) {
     log.debug(`existing event${existing ? '' : ' not'} found`);
 
     if (existing) {
+      /*
       if (ctx.get('if-none-match') === '*') {
         log.warn('if-none-match: * header present, precondition failed');
         ctx.status = 412;
         ctx.body = preconditionFail(ctx.url, 'no-uid-conflict');
         return;
       }
+      */
 
       const updateObject = await options.data.updateEvent(ctx, {
         eventId: ctx.state.params.eventId,