caldav-adapter 9.3.10 → 9.3.12

package/index.js

@@ -44,17 +44,20 @@ module.exports = function (options) {
     principalRegex.keys
   );
 
-  const calendarRoutes = cal({
-    logEnabled: options.logEnabled,
-    logLevel: options.logLevel,
-    data: options.data
-  });
-
-  const principalRoutes = pri({
-    logEnabled: options.logEnabled,
-    logLevel: options.logLevel,
-    data: options.data
-  });
+  //
+  // IMPORTANT: forward the *entire* options object (not just `data`,
+  // `logEnabled`, and `logLevel`) so that downstream tag handlers
+  // (common/tags.js) receive `pushTopicProvider`, `pushSubscriptionURL`,
+  // `pushEnv`, and `pushRefreshInterval`.  Without this, iOS Calendar
+  // never sees the <CS:push-transports> advertisement on the calendar
+  // home and never POSTs to /apns to register for silent push (the
+  // tags handler short-circuits via `typeof options.pushTopicProvider
+  // !== 'function'`).  See Apple's caldav-pubsubdiscovery.txt:
+  // https://github.com/apple/ccs-calendarserver/blob/master/doc/Extensions/caldav-pubsubdiscovery.txt
+  //
+  const calendarRoutes = cal(options);
+
+  const principalRoutes = pri(options);
 
   const fillParameters = function (ctx) {
     ctx.state.params = {};
@@ -123,20 +126,31 @@ module.exports = function (options) {
   const fillRoutes = function (ctx) {
     ctx.state.principalRootUrl = principalRoute;
     if (ctx.state.params.principalId) {
+      // Encode @ as %40 in principalId for URL construction.
+      // iOS/macOS URL parser treats bare @ in path segments as a userinfo
+      // separator (RFC 3986 §3.2.1), which corrupts the request URL and
+      // causes events to silently not appear in Apple Calendar.
+      // All URLs returned by the server (calendar-home-set, principal-URL,
+      // schedule-inbox-URL, event hrefs, etc.) must use %40 so that Apple
+      // clients send subsequent requests with the encoded form.
+      const encodedPrincipalId = ctx.state.params.principalId.replaceAll(
+        '@',
+        '%40'
+      );
       ctx.state.calendarHomeUrl = path.join(
         calendarRoute,
-        ctx.state.params.principalId,
+        encodedPrincipalId,
         '/'
       );
       ctx.state.principalUrl = path.join(
         principalRoute,
-        ctx.state.params.principalId,
+        encodedPrincipalId,
         '/'
       );
       if (ctx.state.params.calendarId) {
         ctx.state.calendarUrl = path.join(
           calendarRoute,
-          ctx.state.params.principalId,
+          encodedPrincipalId,
           ctx.state.params.calendarId,
           '/'
         );

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