caldav-adapter 8.2.10 → 8.2.11

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

package/routes/principal/get.js

@@ -0,0 +1,27 @@
+const {
+  build,
+  multistatus,
+  response,
+  status,
+  href,
+  buildTag
+} = require('../../common/x-build');
+
+module.exports = function (_options) {
+  return async function (ctx) {
+    // GET requests to principals should return the current user principal
+    // This is what CalDAV clients expect when they follow redirects from root URL
+
+    const principalInfo = [
+      {
+        [buildTag('DAV:', 'current-user-principal')]: href(
+          ctx.state.principalUrl
+        )
+      }
+    ];
+
+    const resps = response(ctx.url, status[200], principalInfo);
+    const ms = multistatus([resps]);
+    return build(ms);
+  };
+};

package/routes/principal/principal.js

@@ -6,6 +6,7 @@ const {
 } = require('../../common/response');
 const winston = require('../../common/winston');
 const routePropfind = require('./propfind');
+const routeGet = require('./get'); // New GET handler
 const routeMkCalendar = require('./mkcalendar');
 // const routeReport = require('./report');
 
@@ -13,7 +14,7 @@ module.exports = function (options) {
   const log = winston({ ...options, label: 'principal' });
   const methods = {
     propfind: routePropfind(options),
-    get: routePropfind(options), // Handle GET same as PROPFIND for redirected requests
+    get: routeGet(options), // Use proper GET handler instead of reusing PROPFIND
     // report: reportReport(opts)
     //
     // TODO: proppatch