caldav-adapter 9.3.7 → 9.3.9

package/common/tags.js

@@ -511,6 +511,71 @@ module.exports = function (options) {
       },
       'notification-URL': {
         doc: 'https://github.com/apple/ccs-calendarserver/blob/master/doc/Extensions/caldav-notifications.txt'
+      },
+      'push-transports': {
+        // https://github.com/apple/ccs-calendarserver/blob/master/doc/Extensions/caldav-pubsubdiscovery.txt
+        doc: 'https://github.com/apple/ccs-calendarserver/blob/master/doc/Extensions/caldav-pubsubdiscovery.txt',
+        async resp({ resource, calendar, ctx }) {
+          if (resource !== 'principal' && resource !== 'calendar') return;
+          if (typeof options.pushTopicProvider !== 'function') return;
+          let topic;
+          try {
+            topic = await options.pushTopicProvider({
+              resource,
+              calendar,
+              ctx
+            });
+          } catch (err) {
+            log.warn('pushTopicProvider threw', err);
+            return;
+          }
+
+          if (!topic) return;
+          const subscriptionURL =
+            (typeof options.pushSubscriptionURL === 'string' &&
+              options.pushSubscriptionURL) ||
+            '/apns';
+          const pushEnv =
+            (typeof options.pushEnv === 'string' && options.pushEnv) ||
+            'PRODUCTION';
+          const refreshInterval =
+            (typeof options.pushRefreshInterval === 'string' &&
+              options.pushRefreshInterval) ||
+            '3600';
+          return {
+            [buildTag(cs, 'push-transports')]: {
+              [buildTag(cs, 'transport')]: {
+                '@type': 'APSD',
+                [buildTag(cs, 'subscription-url')]: {
+                  [buildTag(dav, 'href')]: subscriptionURL
+                },
+                [buildTag(cs, 'apsbundleid')]: topic,
+                [buildTag(cs, 'env')]: pushEnv,
+                [buildTag(cs, 'refresh-interval')]: refreshInterval
+              }
+            }
+          };
+        }
+      },
+      pushkey: {
+        // https://github.com/apple/ccs-calendarserver/blob/master/doc/Extensions/caldav-pubsubdiscovery.txt
+        doc: 'https://github.com/apple/ccs-calendarserver/blob/master/doc/Extensions/caldav-pubsubdiscovery.txt',
+        async resp({ resource, calendar }) {
+          if (resource !== 'calendar' || !calendar) return;
+          if (typeof options.pushTopicProvider !== 'function') return;
+          // pushkey is the opaque per-collection identifier iOS sends back
+          // in /apns POST so we can map device_token -> calendar.
+          const key =
+            calendar.calendarId ||
+            (calendar._id &&
+              calendar._id.toString &&
+              calendar._id.toString()) ||
+            '';
+          if (!key) return;
+          return {
+            [buildTag(cs, 'pushkey')]: key
+          };
+        }
       }
     },
     [ical]: {

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

package/routes/calendar/calendar/put.js

@@ -7,7 +7,7 @@ module.exports = function (options) {
   const log = winston({ ...options, label: 'calendar/put' });
 
   const exec = async function (ctx, calendar) {
-    if (calendar.readonly) {
+    if (calendar && calendar.readonly) {
       setMissingMethod(ctx);
       return;
     }

package/routes/calendar/calendar.js

@@ -93,7 +93,7 @@ module.exports = function (options) {
         return;
       }
 
-      if (!calendar && method !== 'mkcalendar') {
+      if (!calendar && method !== 'mkcalendar' && method !== 'put') {
         log.warn(`calendar not found: ${calendarId}`);
         setMissingMethod(ctx);
         ctx.body = notFound(ctx.url);