3 files changed, 48 insertions, 7 deletions

diff --git a/apps/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php
index 75c815c3b0a..79d2244b42c 100644
--- a/apps/dav/lib/CalDAV/Calendar.php
+++ b/apps/dav/lib/CalDAV/Calendar.php
@@ -400,7 +400,7 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IRestorable, IShareable
 		return isset($this->calendarInfo['{http://owncloud.org/ns}public']);
 	}
 
-	protected function isShared() {
+	public function isShared() {
 		if (!isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal'])) {
 			return false;
 		}
@@ -412,6 +412,13 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IRestorable, IShareable
 		return isset($this->calendarInfo['{http://calendarserver.org/ns/}source']);
 	}
 
+	public function isDeleted(): bool {
+		if (!isset($this->calendarInfo[TrashbinPlugin::PROPERTY_DELETED_AT])) {
+			return false;
+		}
+		return $this->calendarInfo[TrashbinPlugin::PROPERTY_DELETED_AT] !== null;
+	}
+
 	/**
 	 * @inheritDoc
 	 */
diff --git a/apps/dav/lib/CalDAV/PublicCalendar.php b/apps/dav/lib/CalDAV/PublicCalendar.php
index 4a29c8d237a..16c7f86917d 100644
--- a/apps/dav/lib/CalDAV/PublicCalendar.php
+++ b/apps/dav/lib/CalDAV/PublicCalendar.php
@@ -84,7 +84,7 @@ class PublicCalendar extends Calendar {
 	 * public calendars are always shared
 	 * @return bool
 	 */
-	protected function isShared() {
+	public function isShared() {
 		return true;
 	}
 }
diff --git a/apps/dav/lib/CalDAV/Schedule/Plugin.php b/apps/dav/lib/CalDAV/Schedule/Plugin.php
index 96bacce4454..74865297944 100644
--- a/apps/dav/lib/CalDAV/Schedule/Plugin.php
+++ b/apps/dav/lib/CalDAV/Schedule/Plugin.php
@@ -30,6 +30,7 @@ namespace OCA\DAV\CalDAV\Schedule;
 
 use DateTimeZone;
 use OCA\DAV\CalDAV\CalDavBackend;
+use OCA\DAV\CalDAV\Calendar;
 use OCA\DAV\CalDAV\CalendarHome;
 use OCP\IConfig;
 use Sabre\CalDAV\ICalendar;
@@ -299,12 +300,14 @@ EOF;
 					return null;
 				}
 
+				$isResourceOrRoom = strpos($principalUrl, 'principals/calendar-resources') === 0 ||
+					strpos($principalUrl, 'principals/calendar-rooms') === 0;
+
 				if (strpos($principalUrl, 'principals/users') === 0) {
 					[, $userId] = split($principalUrl);
 					$uri = $this->config->getUserValue($userId, 'dav', 'defaultCalendar', CalDavBackend::PERSONAL_CALENDAR_URI);
 					$displayName = CalDavBackend::PERSONAL_CALENDAR_NAME;
-				} elseif (strpos($principalUrl, 'principals/calendar-resources') === 0 ||
-						  strpos($principalUrl, 'principals/calendar-rooms') === 0) {
+				} elseif ($isResourceOrRoom) {
 					$uri = CalDavBackend::RESOURCE_BOOKING_CALENDAR_URI;
 					$displayName = CalDavBackend::RESOURCE_BOOKING_CALENDAR_NAME;
 				} else {
@@ -316,9 +319,40 @@ EOF;
 				/** @var CalendarHome $calendarHome */
 				$calendarHome = $this->server->tree->getNodeForPath($calendarHomePath);
 				if (!$calendarHome->childExists($uri)) {
-					$calendarHome->getCalDAVBackend()->createCalendar($principalUrl, $uri, [
-						'{DAV:}displayname' => $displayName,
-					]);
+					// If the default calendar doesn't exist
+					if ($isResourceOrRoom) {
+						$calendarHome->getCalDAVBackend()->createCalendar($principalUrl, $uri, [
+							'{DAV:}displayname' => $displayName,
+						]);
+					} else {
+						// And we're not handling scheduling on resource/room booking
+						$userCalendars = [];
+						/**
+						 * If the default calendar of the user isn't set and the
+						 * fallback doesn't match any of the user's calendar
+						 * try to find the first "personal" calendar we can write to
+						 * instead of creating a new one.
+						 * A appropriate personal calendar to receive invites:
+						 * - isn't a calendar subscription
+						 * - user can write to it (no virtual/3rd-party calendars)
+						 * - calendar isn't a share
+						 */
+						foreach ($calendarHome->getChildren() as $node) {
+							if ($node instanceof Calendar && !$node->isSubscription() && $node->canWrite() && !$node->isShared() && !$node->isDeleted()) {
+								$userCalendars[] = $node;
+							}
+						}
+
+						if (count($userCalendars) > 0) {
+							// Calendar backend returns calendar by calendarorder property
+							$uri = $userCalendars[0]->getName();
+						} else {
+							// Otherwise if we have really nothing, create a new calendar
+							$calendarHome->getCalDAVBackend()->createCalendar($principalUrl, $uri, [
+								'{DAV:}displayname' => $displayName,
+							]);
+						}
+					}
 				}
 
 				$result = $this->server->getPropertiesForPath($calendarHomePath . '/' . $uri, [], 1);