caldav-adapter 4.3.0 → 4.3.1

package/lib/common/eventBuild.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ical_generator_1 = __importDefault(require("ical-generator"));
 const moment_1 = __importDefault(require("moment"));
 const date_1 = require("../common/date");
-const rrule_1 = __importDefault(require("rrule"));
+const rrule_1 = require("rrule");
 const FIXED_DOMAIN = 'DOMAIN_TO_REMOVE';
 /**
  * Adapted from https://github.com/sebbo2002/ical-generator
@@ -130,7 +130,7 @@ function default_1(opts) {
             }
             if (parsed.rrule) {
                 obj.recurring = {
-                    freq: rrule_1.default.RRule.FREQUENCIES[parsed.rrule.origOptions.freq]
+                    freq: rrule_1.RRule.FREQUENCIES[parsed.rrule.origOptions.freq]
                 };
                 if (parsed.rrule.origOptions.until) {
                     obj.recurring.until = (0, date_1.formatted)(parsed.rrule.origOptions.until);

package/lib/routes/calendar/calendar/calendar-query.js

@@ -36,18 +36,24 @@ function default_1(opts) {
     return async function (ctx, calendar) {
         /* https://tools.ietf.org/html/rfc4791#section-9.9 */
         const filters = xml.get('/CAL:calendar-query/CAL:filter/CAL:comp-filter[@name=\'VCALENDAR\']/CAL:comp-filter[@name=\'VEVENT\']/CAL:time-range', ctx.request.xml);
+        const { children } = xml.getWithChildren('/CAL:calendar-query/D:prop', ctx.request.xml);
+        const fullData = lodash_1.default.some(children, (child) => {
+            return child.localName === 'calendar-data';
+        });
         if (!filters || !filters[0]) {
-            return { responses: [] };
+            const events = await opts.data.getEventsForCalendar({
+                principalId: ctx.state.params.principalId,
+                calendarId: calendar.calendarId,
+                user: ctx.state.user,
+                fullData: fullData
+            });
+            return await eventResponse(ctx, events, calendar, children);
         }
         const filter = filters[0];
         const startAttr = lodash_1.default.find(filter.attributes, { localName: 'start' });
         const start = startAttr ? (0, date_1.formatted)(startAttr.nodeValue) : null;
         const endAttr = lodash_1.default.find(filter.attributes, { localName: 'end' });
         const end = endAttr ? (0, date_1.formatted)(endAttr.nodeValue) : null;
-        const { children } = xml.getWithChildren('/CAL:calendar-query/D:prop', ctx.request.xml);
-        const fullData = lodash_1.default.some(children, (child) => {
-            return child.localName === 'calendar-data';
-        });
         const events = await opts.data.getEventsByDate({
             principalId: ctx.state.params.principalId,
             calendarId: calendar.calendarId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caldav-adapter",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "description": "Middleware to handle CalDAV requests to node web server.",