nextcloud / server

apps/dav/lib/Settings/ExampleContentSettings.php

Indentation +43 added lines, -43 removed lines

@@ -18,54 +18,54 @@
 use OCP\Settings\ISettings;
 
 class ExampleContentSettings implements ISettings {
-	public function __construct(
-		private readonly IAppConfig $appConfig,
-		private readonly IInitialState $initialState,
-		private readonly IAppManager $appManager,
-		private readonly ExampleEventService $exampleEventService,
-		private readonly ExampleContactService $exampleContactService,
-	) {
-	}
+    public function __construct(
+        private readonly IAppConfig $appConfig,
+        private readonly IInitialState $initialState,
+        private readonly IAppManager $appManager,
+        private readonly ExampleEventService $exampleEventService,
+        private readonly ExampleContactService $exampleContactService,
+    ) {
+    }
 
-	public function getForm(): TemplateResponse {
-		$calendarEnabled = $this->appManager->isEnabledForUser('calendar');
-		$contactsEnabled = $this->appManager->isEnabledForUser('contacts');
-		$this->initialState->provideInitialState('calendarEnabled', $calendarEnabled);
-		$this->initialState->provideInitialState('contactsEnabled', $contactsEnabled);
+    public function getForm(): TemplateResponse {
+        $calendarEnabled = $this->appManager->isEnabledForUser('calendar');
+        $contactsEnabled = $this->appManager->isEnabledForUser('contacts');
+        $this->initialState->provideInitialState('calendarEnabled', $calendarEnabled);
+        $this->initialState->provideInitialState('contactsEnabled', $contactsEnabled);
 
-		if ($calendarEnabled) {
-			$enableDefaultEvent = $this->exampleEventService->shouldCreateExampleEvent();
-			$this->initialState->provideInitialState('create_example_event', $enableDefaultEvent);
-			$this->initialState->provideInitialState(
-				'has_custom_example_event',
-				$this->exampleEventService->hasCustomExampleEvent(),
-			);
-		}
+        if ($calendarEnabled) {
+            $enableDefaultEvent = $this->exampleEventService->shouldCreateExampleEvent();
+            $this->initialState->provideInitialState('create_example_event', $enableDefaultEvent);
+            $this->initialState->provideInitialState(
+                'has_custom_example_event',
+                $this->exampleEventService->hasCustomExampleEvent(),
+            );
+        }
 
-		if ($contactsEnabled) {
-			$this->initialState->provideInitialState(
-				'enableDefaultContact',
-				$this->exampleContactService->isDefaultContactEnabled(),
-			);
-			$this->initialState->provideInitialState(
-				'hasCustomDefaultContact',
-				$this->appConfig->getAppValueBool('hasCustomDefaultContact'),
-			);
-		}
+        if ($contactsEnabled) {
+            $this->initialState->provideInitialState(
+                'enableDefaultContact',
+                $this->exampleContactService->isDefaultContactEnabled(),
+            );
+            $this->initialState->provideInitialState(
+                'hasCustomDefaultContact',
+                $this->appConfig->getAppValueBool('hasCustomDefaultContact'),
+            );
+        }
 
-		return new TemplateResponse(Application::APP_ID, 'settings-example-content');
-	}
+        return new TemplateResponse(Application::APP_ID, 'settings-example-content');
+    }
 
-	public function getSection(): ?string {
-		if (!$this->appManager->isEnabledForUser('contacts')
-				&& !$this->appManager->isEnabledForUser('calendar')) {
-			return null;
-		}
+    public function getSection(): ?string {
+        if (!$this->appManager->isEnabledForUser('contacts')
+                && !$this->appManager->isEnabledForUser('calendar')) {
+            return null;
+        }
 
-		return 'groupware';
-	}
+        return 'groupware';
+    }
 
-	public function getPriority(): int {
-		return 10;
-	}
+    public function getPriority(): int {
+        return 10;
+    }
 }

apps/dav/lib/Service/ExampleContactService.php

Indentation +110 added lines, -110 removed lines

@@ -19,114 +19,114 @@
 use Symfony\Component\Uid\Uuid;
 
 class ExampleContactService {
-	private readonly IAppData $appData;
-
-	public function __construct(
-		IAppDataFactory $appDataFactory,
-		private readonly IAppConfig $appConfig,
-		private readonly LoggerInterface $logger,
-		private readonly CardDavBackend $cardDav,
-	) {
-		$this->appData = $appDataFactory->get(Application::APP_ID);
-	}
-
-	public function isDefaultContactEnabled(): bool {
-		return $this->appConfig->getAppValueBool('enableDefaultContact', true);
-	}
-
-	public function setDefaultContactEnabled(bool $value): void {
-		$this->appConfig->setAppValueBool('enableDefaultContact', $value);
-	}
-
-	public function getCard(): ?string {
-		try {
-			$folder = $this->appData->getFolder('defaultContact');
-		} catch (NotFoundException $e) {
-			return null;
-		}
-
-		if (!$folder->fileExists('defaultContact.vcf')) {
-			return null;
-		}
-
-		return $folder->getFile('defaultContact.vcf')->getContent();
-	}
-
-	public function setCard(?string $cardData = null) {
-		try {
-			$folder = $this->appData->getFolder('defaultContact');
-		} catch (NotFoundException $e) {
-			$folder = $this->appData->newFolder('defaultContact');
-		}
-
-		$isCustom = true;
-		if (is_null($cardData)) {
-			$cardData = file_get_contents(__DIR__ . '/../ExampleContentFiles/exampleContact.vcf');
-			$isCustom = false;
-		}
-
-		if (!$cardData) {
-			throw new \Exception('Could not read exampleContact.vcf');
-		}
-
-		$file = (!$folder->fileExists('defaultContact.vcf')) ? $folder->newFile('defaultContact.vcf') : $folder->getFile('defaultContact.vcf');
-		$file->putContent($cardData);
-
-		$this->appConfig->setAppValueBool('hasCustomDefaultContact', $isCustom);
-	}
-
-	public function defaultContactExists(): bool {
-		try {
-			$folder = $this->appData->getFolder('defaultContact');
-		} catch (NotFoundException $e) {
-			return false;
-		}
-		return $folder->fileExists('defaultContact.vcf');
-	}
-
-	public function createDefaultContact(int $addressBookId): void {
-		if (!$this->isDefaultContactEnabled()) {
-			return;
-		}
-
-		try {
-			$folder = $this->appData->getFolder('defaultContact');
-			$defaultContactFile = $folder->getFile('defaultContact.vcf');
-			$data = $defaultContactFile->getContent();
-		} catch (\Exception $e) {
-			$this->logger->error('Couldn\'t get default contact file', ['exception' => $e]);
-			return;
-		}
-
-		// Make sure the UID is unique
-		$newUid = Uuid::v4()->toRfc4122();
-		$newRev = date('Ymd\THis\Z');
-		$vcard = \Sabre\VObject\Reader::read($data, \Sabre\VObject\Reader::OPTION_FORGIVING);
-		if ($vcard->UID) {
-			$vcard->UID->setValue($newUid);
-		} else {
-			$vcard->add('UID', $newUid);
-		}
-		if ($vcard->REV) {
-			$vcard->REV->setValue($newRev);
-		} else {
-			$vcard->add('REV', $newRev);
-		}
-
-		// Level 3 means that the document is invalid
-		// https://sabre.io/vobject/vcard/#validating-vcard
-		$level3Warnings = array_filter($vcard->validate(), static function ($warning) {
-			return $warning['level'] === 3;
-		});
-
-		if (!empty($level3Warnings)) {
-			$this->logger->error('Default contact is invalid', ['warnings' => $level3Warnings]);
-			return;
-		}
-		try {
-			$this->cardDav->createCard($addressBookId, 'default', $vcard->serialize(), false);
-		} catch (\Exception $e) {
-			$this->logger->error($e->getMessage(), ['exception' => $e]);
-		}
-	}
+    private readonly IAppData $appData;
+
+    public function __construct(
+        IAppDataFactory $appDataFactory,
+        private readonly IAppConfig $appConfig,
+        private readonly LoggerInterface $logger,
+        private readonly CardDavBackend $cardDav,
+    ) {
+        $this->appData = $appDataFactory->get(Application::APP_ID);
+    }
+
+    public function isDefaultContactEnabled(): bool {
+        return $this->appConfig->getAppValueBool('enableDefaultContact', true);
+    }
+
+    public function setDefaultContactEnabled(bool $value): void {
+        $this->appConfig->setAppValueBool('enableDefaultContact', $value);
+    }
+
+    public function getCard(): ?string {
+        try {
+            $folder = $this->appData->getFolder('defaultContact');
+        } catch (NotFoundException $e) {
+            return null;
+        }
+
+        if (!$folder->fileExists('defaultContact.vcf')) {
+            return null;
+        }
+
+        return $folder->getFile('defaultContact.vcf')->getContent();
+    }
+
+    public function setCard(?string $cardData = null) {
+        try {
+            $folder = $this->appData->getFolder('defaultContact');
+        } catch (NotFoundException $e) {
+            $folder = $this->appData->newFolder('defaultContact');
+        }
+
+        $isCustom = true;
+        if (is_null($cardData)) {
+            $cardData = file_get_contents(__DIR__ . '/../ExampleContentFiles/exampleContact.vcf');
+            $isCustom = false;
+        }
+
+        if (!$cardData) {
+            throw new \Exception('Could not read exampleContact.vcf');
+        }
+
+        $file = (!$folder->fileExists('defaultContact.vcf')) ? $folder->newFile('defaultContact.vcf') : $folder->getFile('defaultContact.vcf');
+        $file->putContent($cardData);
+
+        $this->appConfig->setAppValueBool('hasCustomDefaultContact', $isCustom);
+    }
+
+    public function defaultContactExists(): bool {
+        try {
+            $folder = $this->appData->getFolder('defaultContact');
+        } catch (NotFoundException $e) {
+            return false;
+        }
+        return $folder->fileExists('defaultContact.vcf');
+    }
+
+    public function createDefaultContact(int $addressBookId): void {
+        if (!$this->isDefaultContactEnabled()) {
+            return;
+        }
+
+        try {
+            $folder = $this->appData->getFolder('defaultContact');
+            $defaultContactFile = $folder->getFile('defaultContact.vcf');
+            $data = $defaultContactFile->getContent();
+        } catch (\Exception $e) {
+            $this->logger->error('Couldn\'t get default contact file', ['exception' => $e]);
+            return;
+        }
+
+        // Make sure the UID is unique
+        $newUid = Uuid::v4()->toRfc4122();
+        $newRev = date('Ymd\THis\Z');
+        $vcard = \Sabre\VObject\Reader::read($data, \Sabre\VObject\Reader::OPTION_FORGIVING);
+        if ($vcard->UID) {
+            $vcard->UID->setValue($newUid);
+        } else {
+            $vcard->add('UID', $newUid);
+        }
+        if ($vcard->REV) {
+            $vcard->REV->setValue($newRev);
+        } else {
+            $vcard->add('REV', $newRev);
+        }
+
+        // Level 3 means that the document is invalid
+        // https://sabre.io/vobject/vcard/#validating-vcard
+        $level3Warnings = array_filter($vcard->validate(), static function ($warning) {
+            return $warning['level'] === 3;
+        });
+
+        if (!empty($level3Warnings)) {
+            $this->logger->error('Default contact is invalid', ['warnings' => $level3Warnings]);
+            return;
+        }
+        try {
+            $this->cardDav->createCard($addressBookId, 'default', $vcard->serialize(), false);
+        } catch (\Exception $e) {
+            $this->logger->error($e->getMessage(), ['exception' => $e]);
+        }
+    }
 }

apps/dav/lib/Controller/ExampleContentController.php

Indentation +64 added lines, -64 removed lines

@@ -22,77 +22,77 @@
 use Psr\Log\LoggerInterface;
 
 class ExampleContentController extends ApiController {
-	public function __construct(
-		IRequest $request,
-		private readonly LoggerInterface $logger,
-		private readonly ExampleEventService $exampleEventService,
-		private readonly ExampleContactService $exampleContactService,
-	) {
-		parent::__construct(Application::APP_ID, $request);
-	}
+    public function __construct(
+        IRequest $request,
+        private readonly LoggerInterface $logger,
+        private readonly ExampleEventService $exampleEventService,
+        private readonly ExampleContactService $exampleContactService,
+    ) {
+        parent::__construct(Application::APP_ID, $request);
+    }
 
-	#[FrontpageRoute(verb: 'PUT', url: '/api/defaultcontact/config')]
-	public function setEnableDefaultContact(bool $allow): JSONResponse {
-		if ($allow && !$this->exampleContactService->defaultContactExists()) {
-			try {
-				$this->exampleContactService->setCard();
-			} catch (\Exception $e) {
-				$this->logger->error('Could not create default contact', ['exception' => $e]);
-				return new JSONResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
-			}
-		}
-		$this->exampleContactService->setDefaultContactEnabled($allow);
-		return new JSONResponse([], Http::STATUS_OK);
-	}
+    #[FrontpageRoute(verb: 'PUT', url: '/api/defaultcontact/config')]
+    public function setEnableDefaultContact(bool $allow): JSONResponse {
+        if ($allow && !$this->exampleContactService->defaultContactExists()) {
+            try {
+                $this->exampleContactService->setCard();
+            } catch (\Exception $e) {
+                $this->logger->error('Could not create default contact', ['exception' => $e]);
+                return new JSONResponse([], Http::STATUS_INTERNAL_SERVER_ERROR);
+            }
+        }
+        $this->exampleContactService->setDefaultContactEnabled($allow);
+        return new JSONResponse([], Http::STATUS_OK);
+    }
 
-	#[NoCSRFRequired]
-	#[FrontpageRoute(verb: 'GET', url: '/api/defaultcontact/contact')]
-	public function getDefaultContact(): DataDownloadResponse {
-		$cardData = $this->exampleContactService->getCard()
-			?? file_get_contents(__DIR__ . '/../ExampleContentFiles/exampleContact.vcf');
-		return new DataDownloadResponse($cardData, 'example_contact.vcf', 'text/vcard');
-	}
+    #[NoCSRFRequired]
+    #[FrontpageRoute(verb: 'GET', url: '/api/defaultcontact/contact')]
+    public function getDefaultContact(): DataDownloadResponse {
+        $cardData = $this->exampleContactService->getCard()
+            ?? file_get_contents(__DIR__ . '/../ExampleContentFiles/exampleContact.vcf');
+        return new DataDownloadResponse($cardData, 'example_contact.vcf', 'text/vcard');
+    }
 
-	#[FrontpageRoute(verb: 'PUT', url: '/api/defaultcontact/contact')]
-	public function setDefaultContact(?string $contactData = null) {
-		if (!$this->exampleContactService->isDefaultContactEnabled()) {
-			return new JSONResponse([], Http::STATUS_FORBIDDEN);
-		}
-		$this->exampleContactService->setCard($contactData);
-		return new JSONResponse([], Http::STATUS_OK);
-	}
+    #[FrontpageRoute(verb: 'PUT', url: '/api/defaultcontact/contact')]
+    public function setDefaultContact(?string $contactData = null) {
+        if (!$this->exampleContactService->isDefaultContactEnabled()) {
+            return new JSONResponse([], Http::STATUS_FORBIDDEN);
+        }
+        $this->exampleContactService->setCard($contactData);
+        return new JSONResponse([], Http::STATUS_OK);
+    }
 
-	#[FrontpageRoute(verb: 'POST', url: '/api/exampleEvent/enable')]
-	public function setCreateExampleEvent(bool $enable): JSONResponse {
-		$this->exampleEventService->setCreateExampleEvent($enable);
-		return new JsonResponse([]);
-	}
+    #[FrontpageRoute(verb: 'POST', url: '/api/exampleEvent/enable')]
+    public function setCreateExampleEvent(bool $enable): JSONResponse {
+        $this->exampleEventService->setCreateExampleEvent($enable);
+        return new JsonResponse([]);
+    }
 
-	#[FrontpageRoute(verb: 'GET', url: '/api/exampleEvent/event')]
-	#[NoCSRFRequired]
-	public function downloadExampleEvent(): DataDownloadResponse {
-		$exampleEvent = $this->exampleEventService->getExampleEvent();
-		return new DataDownloadResponse(
-			$exampleEvent->getIcs(),
-			'example_event.ics',
-			'text/calendar',
-		);
-	}
+    #[FrontpageRoute(verb: 'GET', url: '/api/exampleEvent/event')]
+    #[NoCSRFRequired]
+    public function downloadExampleEvent(): DataDownloadResponse {
+        $exampleEvent = $this->exampleEventService->getExampleEvent();
+        return new DataDownloadResponse(
+            $exampleEvent->getIcs(),
+            'example_event.ics',
+            'text/calendar',
+        );
+    }
 
-	#[FrontpageRoute(verb: 'POST', url: '/api/exampleEvent/event')]
-	public function uploadExampleEvent(string $ics): JSONResponse {
-		if (!$this->exampleEventService->shouldCreateExampleEvent()) {
-			return new JSONResponse([], Http::STATUS_FORBIDDEN);
-		}
+    #[FrontpageRoute(verb: 'POST', url: '/api/exampleEvent/event')]
+    public function uploadExampleEvent(string $ics): JSONResponse {
+        if (!$this->exampleEventService->shouldCreateExampleEvent()) {
+            return new JSONResponse([], Http::STATUS_FORBIDDEN);
+        }
 
-		$this->exampleEventService->saveCustomExampleEvent($ics);
-		return new JsonResponse([]);
-	}
+        $this->exampleEventService->saveCustomExampleEvent($ics);
+        return new JsonResponse([]);
+    }
 
-	#[FrontpageRoute(verb: 'DELETE', url: '/api/exampleEvent/event')]
-	public function deleteExampleEvent(): JSONResponse {
-		$this->exampleEventService->deleteCustomExampleEvent();
-		return new JsonResponse([]);
-	}
+    #[FrontpageRoute(verb: 'DELETE', url: '/api/exampleEvent/event')]
+    public function deleteExampleEvent(): JSONResponse {
+        $this->exampleEventService->deleteCustomExampleEvent();
+        return new JsonResponse([]);
+    }
 
 }

apps/dav/lib/Listener/UserEventsListener.php

Indentation +145 added lines, -145 removed lines

@@ -33,149 +33,149 @@
 /** @template-implements IEventListener<UserFirstTimeLoggedInEvent|UserIdAssignedEvent|BeforeUserIdUnassignedEvent|UserIdUnassignedEvent|BeforeUserDeletedEvent|UserDeletedEvent|UserCreatedEvent|UserChangedEvent|UserUpdatedEvent> */
 class UserEventsListener implements IEventListener {
 
-	/** @var IUser[] */
-	private array $usersToDelete = [];
-
-	private array $calendarsToDelete = [];
-	private array $subscriptionsToDelete = [];
-	private array $addressBooksToDelete = [];
-
-	public function __construct(
-		private IUserManager $userManager,
-		private SyncService $syncService,
-		private CalDavBackend $calDav,
-		private CardDavBackend $cardDav,
-		private Defaults $themingDefaults,
-		private ExampleContactService $exampleContactService,
-		private ExampleEventService $exampleEventService,
-		private LoggerInterface $logger,
-	) {
-	}
-
-	public function handle(Event $event): void {
-		if ($event instanceof UserCreatedEvent) {
-			$this->postCreateUser($event->getUser());
-		} elseif ($event instanceof UserIdAssignedEvent) {
-			$user = $this->userManager->get($event->getUserId());
-			if ($user !== null) {
-				$this->postCreateUser($user);
-			}
-		} elseif ($event instanceof BeforeUserDeletedEvent) {
-			$this->preDeleteUser($event->getUser());
-		} elseif ($event instanceof BeforeUserIdUnassignedEvent) {
-			$this->preUnassignedUserId($event->getUserId());
-		} elseif ($event instanceof UserDeletedEvent) {
-			$this->postDeleteUser($event->getUid());
-		} elseif ($event instanceof UserIdUnassignedEvent) {
-			$this->postDeleteUser($event->getUserId());
-		} elseif ($event instanceof UserChangedEvent) {
-			$this->changeUser($event->getUser(), $event->getFeature());
-		} elseif ($event instanceof UserFirstTimeLoggedInEvent) {
-			$this->firstLogin($event->getUser());
-		} elseif ($event instanceof UserUpdatedEvent) {
-			$this->updateUser($event->getUser());
-		}
-	}
-
-	public function postCreateUser(IUser $user): void {
-		$this->syncService->updateUser($user);
-	}
-
-	public function updateUser(IUser $user): void {
-		$this->syncService->updateUser($user);
-	}
-
-	public function preDeleteUser(IUser $user): void {
-		$uid = $user->getUID();
-		$userPrincipalUri = 'principals/users/' . $uid;
-		$this->usersToDelete[$uid] = $user;
-		$this->calendarsToDelete[$uid] = $this->calDav->getUsersOwnCalendars($userPrincipalUri);
-		$this->subscriptionsToDelete[$uid] = $this->calDav->getSubscriptionsForUser($userPrincipalUri);
-		$this->addressBooksToDelete[$uid] = $this->cardDav->getUsersOwnAddressBooks($userPrincipalUri);
-	}
-
-	public function preUnassignedUserId(string $uid): void {
-		$user = $this->userManager->get($uid);
-		if ($user !== null) {
-			$this->usersToDelete[$uid] = $user;
-		}
-	}
-
-	public function postDeleteUser(string $uid): void {
-		if (isset($this->usersToDelete[$uid])) {
-			$this->syncService->deleteUser($this->usersToDelete[$uid]);
-		}
-
-		foreach ($this->calendarsToDelete[$uid] as $calendar) {
-			$this->calDav->deleteCalendar(
-				$calendar['id'],
-				true // Make sure the data doesn't go into the trashbin, a new user with the same UID would later see it otherwise
-			);
-		}
-
-		foreach ($this->subscriptionsToDelete[$uid] as $subscription) {
-			$this->calDav->deleteSubscription(
-				$subscription['id'],
-			);
-		}
-		$this->calDav->deleteAllSharesByUser('principals/users/' . $uid);
-
-		foreach ($this->addressBooksToDelete[$uid] as $addressBook) {
-			$this->cardDav->deleteAddressBook($addressBook['id']);
-		}
-
-		unset($this->calendarsToDelete[$uid]);
-		unset($this->subscriptionsToDelete[$uid]);
-		unset($this->addressBooksToDelete[$uid]);
-	}
-
-	public function changeUser(IUser $user, string $feature): void {
-		// This case is already covered by the account manager firing up a signal
-		// later on
-		if ($feature !== 'eMailAddress' && $feature !== 'displayName') {
-			$this->syncService->updateUser($user);
-		}
-	}
-
-	public function firstLogin(IUser $user): void {
-		$principal = 'principals/users/' . $user->getUID();
-
-		$calendarId = null;
-		if ($this->calDav->getCalendarsForUserCount($principal) === 0) {
-			try {
-				$calendarId = $this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [
-					'{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
-					'{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary(),
-					'components' => 'VEVENT'
-				]);
-			} catch (\Exception $e) {
-				$this->logger->error($e->getMessage(), ['exception' => $e]);
-			}
-		}
-		if ($calendarId !== null) {
-			try {
-				$this->exampleEventService->createExampleEvent($calendarId);
-			} catch (\Exception $e) {
-				$this->logger->error('Failed to create example event: ' . $e->getMessage(), [
-					'exception' => $e,
-					'userId' => $user->getUID(),
-					'calendarId' => $calendarId,
-				]);
-			}
-		}
-
-		$addressBookId = null;
-		if ($this->cardDav->getAddressBooksForUserCount($principal) === 0) {
-			try {
-				$addressBookId = $this->cardDav->createAddressBook($principal, CardDavBackend::PERSONAL_ADDRESSBOOK_URI, [
-					'{DAV:}displayname' => CardDavBackend::PERSONAL_ADDRESSBOOK_NAME,
-				]);
-			} catch (\Exception $e) {
-				$this->logger->error($e->getMessage(), ['exception' => $e]);
-			}
-		}
-		if ($addressBookId) {
-			$this->exampleContactService->createDefaultContact($addressBookId);
-		}
-	}
+    /** @var IUser[] */
+    private array $usersToDelete = [];
+
+    private array $calendarsToDelete = [];
+    private array $subscriptionsToDelete = [];
+    private array $addressBooksToDelete = [];
+
+    public function __construct(
+        private IUserManager $userManager,
+        private SyncService $syncService,
+        private CalDavBackend $calDav,
+        private CardDavBackend $cardDav,
+        private Defaults $themingDefaults,
+        private ExampleContactService $exampleContactService,
+        private ExampleEventService $exampleEventService,
+        private LoggerInterface $logger,
+    ) {
+    }
+
+    public function handle(Event $event): void {
+        if ($event instanceof UserCreatedEvent) {
+            $this->postCreateUser($event->getUser());
+        } elseif ($event instanceof UserIdAssignedEvent) {
+            $user = $this->userManager->get($event->getUserId());
+            if ($user !== null) {
+                $this->postCreateUser($user);
+            }
+        } elseif ($event instanceof BeforeUserDeletedEvent) {
+            $this->preDeleteUser($event->getUser());
+        } elseif ($event instanceof BeforeUserIdUnassignedEvent) {
+            $this->preUnassignedUserId($event->getUserId());
+        } elseif ($event instanceof UserDeletedEvent) {
+            $this->postDeleteUser($event->getUid());
+        } elseif ($event instanceof UserIdUnassignedEvent) {
+            $this->postDeleteUser($event->getUserId());
+        } elseif ($event instanceof UserChangedEvent) {
+            $this->changeUser($event->getUser(), $event->getFeature());
+        } elseif ($event instanceof UserFirstTimeLoggedInEvent) {
+            $this->firstLogin($event->getUser());
+        } elseif ($event instanceof UserUpdatedEvent) {
+            $this->updateUser($event->getUser());
+        }
+    }
+
+    public function postCreateUser(IUser $user): void {
+        $this->syncService->updateUser($user);
+    }
+
+    public function updateUser(IUser $user): void {
+        $this->syncService->updateUser($user);
+    }
+
+    public function preDeleteUser(IUser $user): void {
+        $uid = $user->getUID();
+        $userPrincipalUri = 'principals/users/' . $uid;
+        $this->usersToDelete[$uid] = $user;
+        $this->calendarsToDelete[$uid] = $this->calDav->getUsersOwnCalendars($userPrincipalUri);
+        $this->subscriptionsToDelete[$uid] = $this->calDav->getSubscriptionsForUser($userPrincipalUri);
+        $this->addressBooksToDelete[$uid] = $this->cardDav->getUsersOwnAddressBooks($userPrincipalUri);
+    }
+
+    public function preUnassignedUserId(string $uid): void {
+        $user = $this->userManager->get($uid);
+        if ($user !== null) {
+            $this->usersToDelete[$uid] = $user;
+        }
+    }
+
+    public function postDeleteUser(string $uid): void {
+        if (isset($this->usersToDelete[$uid])) {
+            $this->syncService->deleteUser($this->usersToDelete[$uid]);
+        }
+
+        foreach ($this->calendarsToDelete[$uid] as $calendar) {
+            $this->calDav->deleteCalendar(
+                $calendar['id'],
+                true // Make sure the data doesn't go into the trashbin, a new user with the same UID would later see it otherwise
+            );
+        }
+
+        foreach ($this->subscriptionsToDelete[$uid] as $subscription) {
+            $this->calDav->deleteSubscription(
+                $subscription['id'],
+            );
+        }
+        $this->calDav->deleteAllSharesByUser('principals/users/' . $uid);
+
+        foreach ($this->addressBooksToDelete[$uid] as $addressBook) {
+            $this->cardDav->deleteAddressBook($addressBook['id']);
+        }
+
+        unset($this->calendarsToDelete[$uid]);
+        unset($this->subscriptionsToDelete[$uid]);
+        unset($this->addressBooksToDelete[$uid]);
+    }
+
+    public function changeUser(IUser $user, string $feature): void {
+        // This case is already covered by the account manager firing up a signal
+        // later on
+        if ($feature !== 'eMailAddress' && $feature !== 'displayName') {
+            $this->syncService->updateUser($user);
+        }
+    }
+
+    public function firstLogin(IUser $user): void {
+        $principal = 'principals/users/' . $user->getUID();
+
+        $calendarId = null;
+        if ($this->calDav->getCalendarsForUserCount($principal) === 0) {
+            try {
+                $calendarId = $this->calDav->createCalendar($principal, CalDavBackend::PERSONAL_CALENDAR_URI, [
+                    '{DAV:}displayname' => CalDavBackend::PERSONAL_CALENDAR_NAME,
+                    '{http://apple.com/ns/ical/}calendar-color' => $this->themingDefaults->getColorPrimary(),
+                    'components' => 'VEVENT'
+                ]);
+            } catch (\Exception $e) {
+                $this->logger->error($e->getMessage(), ['exception' => $e]);
+            }
+        }
+        if ($calendarId !== null) {
+            try {
+                $this->exampleEventService->createExampleEvent($calendarId);
+            } catch (\Exception $e) {
+                $this->logger->error('Failed to create example event: ' . $e->getMessage(), [
+                    'exception' => $e,
+                    'userId' => $user->getUID(),
+                    'calendarId' => $calendarId,
+                ]);
+            }
+        }
+
+        $addressBookId = null;
+        if ($this->cardDav->getAddressBooksForUserCount($principal) === 0) {
+            try {
+                $addressBookId = $this->cardDav->createAddressBook($principal, CardDavBackend::PERSONAL_ADDRESSBOOK_URI, [
+                    '{DAV:}displayname' => CardDavBackend::PERSONAL_ADDRESSBOOK_NAME,
+                ]);
+            } catch (\Exception $e) {
+                $this->logger->error($e->getMessage(), ['exception' => $e]);
+            }
+        }
+        if ($addressBookId) {
+            $this->exampleContactService->createDefaultContact($addressBookId);
+        }
+    }
 }

apps/dav/tests/unit/DAV/Listener/UserEventsListenerTest.php

Indentation +129 added lines, -129 removed lines

@@ -24,133 +24,133 @@
 use Test\TestCase;
 
 class UserEventsListenerTest extends TestCase {
-	private IUserManager&MockObject $userManager;
-	private SyncService&MockObject $syncService;
-	private CalDavBackend&MockObject $calDavBackend;
-	private CardDavBackend&MockObject $cardDavBackend;
-	private Defaults&MockObject $defaults;
-	private ExampleContactService&MockObject $exampleContactService;
-	private ExampleEventService&MockObject $exampleEventService;
-	private LoggerInterface&MockObject $logger;
-
-	private UserEventsListener $userEventsListener;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->syncService = $this->createMock(SyncService::class);
-		$this->calDavBackend = $this->createMock(CalDavBackend::class);
-		$this->cardDavBackend = $this->createMock(CardDavBackend::class);
-		$this->defaults = $this->createMock(Defaults::class);
-		$this->exampleContactService = $this->createMock(ExampleContactService::class);
-		$this->exampleEventService = $this->createMock(ExampleEventService::class);
-		$this->logger = $this->createMock(LoggerInterface::class);
-
-		$this->userEventsListener = new UserEventsListener(
-			$this->userManager,
-			$this->syncService,
-			$this->calDavBackend,
-			$this->cardDavBackend,
-			$this->defaults,
-			$this->exampleContactService,
-			$this->exampleEventService,
-			$this->logger,
-		);
-	}
-
-	public function test(): void {
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())->method('getUID')->willReturn('newUser');
-
-		$this->defaults->expects($this->once())->method('getColorPrimary')->willReturn('#745bca');
-
-		$this->calDavBackend->expects($this->once())->method('getCalendarsForUserCount')->willReturn(0);
-		$this->calDavBackend->expects($this->once())->method('createCalendar')->with(
-			'principals/users/newUser',
-			'personal', [
-				'{DAV:}displayname' => 'Personal',
-				'{http://apple.com/ns/ical/}calendar-color' => '#745bca',
-				'components' => 'VEVENT'
-			])
-			->willReturn(1000);
-		$this->calDavBackend->expects(self::never())
-			->method('getCalendarsForUser');
-		$this->exampleEventService->expects(self::once())
-			->method('createExampleEvent')
-			->with(1000);
-
-		$this->cardDavBackend->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(0);
-		$this->cardDavBackend->expects($this->once())->method('createAddressBook')->with(
-			'principals/users/newUser',
-			'contacts', ['{DAV:}displayname' => 'Contacts']);
-
-		$this->userEventsListener->firstLogin($user);
-	}
-
-	public function testWithExisting(): void {
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())->method('getUID')->willReturn('newUser');
-
-		$this->calDavBackend->expects($this->once())->method('getCalendarsForUserCount')->willReturn(1);
-		$this->calDavBackend->expects($this->never())->method('createCalendar');
-		$this->calDavBackend->expects(self::never())
-			->method('createCalendar');
-		$this->exampleEventService->expects(self::never())
-			->method('createExampleEvent');
-
-		$this->cardDavBackend->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(1);
-		$this->cardDavBackend->expects($this->never())->method('createAddressBook');
-
-		$this->userEventsListener->firstLogin($user);
-	}
-
-	public function testWithBirthdayCalendar(): void {
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())->method('getUID')->willReturn('newUser');
-
-		$this->defaults->expects($this->once())->method('getColorPrimary')->willReturn('#745bca');
-
-		$this->calDavBackend->expects($this->once())->method('getCalendarsForUserCount')->willReturn(0);
-		$this->calDavBackend->expects($this->once())->method('createCalendar')->with(
-			'principals/users/newUser',
-			'personal', [
-				'{DAV:}displayname' => 'Personal',
-				'{http://apple.com/ns/ical/}calendar-color' => '#745bca',
-				'components' => 'VEVENT'
-			]);
-
-		$this->cardDavBackend->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(0);
-		$this->cardDavBackend->expects($this->once())->method('createAddressBook')->with(
-			'principals/users/newUser',
-			'contacts', ['{DAV:}displayname' => 'Contacts']);
-
-		$this->userEventsListener->firstLogin($user);
-	}
-
-	public function testDeleteCalendar(): void {
-		$user = $this->createMock(IUser::class);
-		$user->expects($this->once())->method('getUID')->willReturn('newUser');
-
-		$this->syncService->expects($this->once())
-			->method('deleteUser');
-
-		$this->calDavBackend->expects($this->once())->method('getUsersOwnCalendars')->willReturn([
-			['id' => 'personal']
-		]);
-		$this->calDavBackend->expects($this->once())->method('getSubscriptionsForUser')->willReturn([
-			['id' => 'some-subscription']
-		]);
-		$this->calDavBackend->expects($this->once())->method('deleteCalendar')->with('personal');
-		$this->calDavBackend->expects($this->once())->method('deleteSubscription')->with('some-subscription');
-		$this->calDavBackend->expects($this->once())->method('deleteAllSharesByUser');
-
-		$this->cardDavBackend->expects($this->once())->method('getUsersOwnAddressBooks')->willReturn([
-			['id' => 'personal']
-		]);
-		$this->cardDavBackend->expects($this->once())->method('deleteAddressBook');
-
-		$this->userEventsListener->preDeleteUser($user);
-		$this->userEventsListener->postDeleteUser('newUser');
-	}
+    private IUserManager&MockObject $userManager;
+    private SyncService&MockObject $syncService;
+    private CalDavBackend&MockObject $calDavBackend;
+    private CardDavBackend&MockObject $cardDavBackend;
+    private Defaults&MockObject $defaults;
+    private ExampleContactService&MockObject $exampleContactService;
+    private ExampleEventService&MockObject $exampleEventService;
+    private LoggerInterface&MockObject $logger;
+
+    private UserEventsListener $userEventsListener;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $this->userManager = $this->createMock(IUserManager::class);
+        $this->syncService = $this->createMock(SyncService::class);
+        $this->calDavBackend = $this->createMock(CalDavBackend::class);
+        $this->cardDavBackend = $this->createMock(CardDavBackend::class);
+        $this->defaults = $this->createMock(Defaults::class);
+        $this->exampleContactService = $this->createMock(ExampleContactService::class);
+        $this->exampleEventService = $this->createMock(ExampleEventService::class);
+        $this->logger = $this->createMock(LoggerInterface::class);
+
+        $this->userEventsListener = new UserEventsListener(
+            $this->userManager,
+            $this->syncService,
+            $this->calDavBackend,
+            $this->cardDavBackend,
+            $this->defaults,
+            $this->exampleContactService,
+            $this->exampleEventService,
+            $this->logger,
+        );
+    }
+
+    public function test(): void {
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->once())->method('getUID')->willReturn('newUser');
+
+        $this->defaults->expects($this->once())->method('getColorPrimary')->willReturn('#745bca');
+
+        $this->calDavBackend->expects($this->once())->method('getCalendarsForUserCount')->willReturn(0);
+        $this->calDavBackend->expects($this->once())->method('createCalendar')->with(
+            'principals/users/newUser',
+            'personal', [
+                '{DAV:}displayname' => 'Personal',
+                '{http://apple.com/ns/ical/}calendar-color' => '#745bca',
+                'components' => 'VEVENT'
+            ])
+            ->willReturn(1000);
+        $this->calDavBackend->expects(self::never())
+            ->method('getCalendarsForUser');
+        $this->exampleEventService->expects(self::once())
+            ->method('createExampleEvent')
+            ->with(1000);
+
+        $this->cardDavBackend->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(0);
+        $this->cardDavBackend->expects($this->once())->method('createAddressBook')->with(
+            'principals/users/newUser',
+            'contacts', ['{DAV:}displayname' => 'Contacts']);
+
+        $this->userEventsListener->firstLogin($user);
+    }
+
+    public function testWithExisting(): void {
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->once())->method('getUID')->willReturn('newUser');
+
+        $this->calDavBackend->expects($this->once())->method('getCalendarsForUserCount')->willReturn(1);
+        $this->calDavBackend->expects($this->never())->method('createCalendar');
+        $this->calDavBackend->expects(self::never())
+            ->method('createCalendar');
+        $this->exampleEventService->expects(self::never())
+            ->method('createExampleEvent');
+
+        $this->cardDavBackend->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(1);
+        $this->cardDavBackend->expects($this->never())->method('createAddressBook');
+
+        $this->userEventsListener->firstLogin($user);
+    }
+
+    public function testWithBirthdayCalendar(): void {
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->once())->method('getUID')->willReturn('newUser');
+
+        $this->defaults->expects($this->once())->method('getColorPrimary')->willReturn('#745bca');
+
+        $this->calDavBackend->expects($this->once())->method('getCalendarsForUserCount')->willReturn(0);
+        $this->calDavBackend->expects($this->once())->method('createCalendar')->with(
+            'principals/users/newUser',
+            'personal', [
+                '{DAV:}displayname' => 'Personal',
+                '{http://apple.com/ns/ical/}calendar-color' => '#745bca',
+                'components' => 'VEVENT'
+            ]);
+
+        $this->cardDavBackend->expects($this->once())->method('getAddressBooksForUserCount')->willReturn(0);
+        $this->cardDavBackend->expects($this->once())->method('createAddressBook')->with(
+            'principals/users/newUser',
+            'contacts', ['{DAV:}displayname' => 'Contacts']);
+
+        $this->userEventsListener->firstLogin($user);
+    }
+
+    public function testDeleteCalendar(): void {
+        $user = $this->createMock(IUser::class);
+        $user->expects($this->once())->method('getUID')->willReturn('newUser');
+
+        $this->syncService->expects($this->once())
+            ->method('deleteUser');
+
+        $this->calDavBackend->expects($this->once())->method('getUsersOwnCalendars')->willReturn([
+            ['id' => 'personal']
+        ]);
+        $this->calDavBackend->expects($this->once())->method('getSubscriptionsForUser')->willReturn([
+            ['id' => 'some-subscription']
+        ]);
+        $this->calDavBackend->expects($this->once())->method('deleteCalendar')->with('personal');
+        $this->calDavBackend->expects($this->once())->method('deleteSubscription')->with('some-subscription');
+        $this->calDavBackend->expects($this->once())->method('deleteAllSharesByUser');
+
+        $this->cardDavBackend->expects($this->once())->method('getUsersOwnAddressBooks')->willReturn([
+            ['id' => 'personal']
+        ]);
+        $this->cardDavBackend->expects($this->once())->method('deleteAddressBook');
+
+        $this->userEventsListener->preDeleteUser($user);
+        $this->userEventsListener->postDeleteUser('newUser');
+    }
 }

apps/dav/appinfo/routes.php

Indentation +16 added lines, -16 removed lines

@@ -4,20 +4,20 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 return [
-	'routes' => [
-		['name' => 'birthday_calendar#enable', 'url' => '/enableBirthdayCalendar', 'verb' => 'POST'],
-		['name' => 'birthday_calendar#disable', 'url' => '/disableBirthdayCalendar', 'verb' => 'POST'],
-		['name' => 'invitation_response#accept', 'url' => '/invitation/accept/{token}', 'verb' => 'GET'],
-		['name' => 'invitation_response#decline', 'url' => '/invitation/decline/{token}', 'verb' => 'GET'],
-		['name' => 'invitation_response#options', 'url' => '/invitation/moreOptions/{token}', 'verb' => 'GET'],
-		['name' => 'invitation_response#processMoreOptionsResult', 'url' => '/invitation/moreOptions/{token}', 'verb' => 'POST'],
-	],
-	'ocs' => [
-		['name' => 'direct#getUrl', 'url' => '/api/v1/direct', 'verb' => 'POST'],
-		['name' => 'upcoming_events#getEvents', 'url' => '/api/v1/events/upcoming', 'verb' => 'GET'],
-		['name' => 'out_of_office#getCurrentOutOfOfficeData', 'url' => '/api/v1/outOfOffice/{userId}/now', 'verb' => 'GET'],
-		['name' => 'out_of_office#getOutOfOffice', 'url' => '/api/v1/outOfOffice/{userId}', 'verb' => 'GET'],
-		['name' => 'out_of_office#setOutOfOffice', 'url' => '/api/v1/outOfOffice/{userId}', 'verb' => 'POST'],
-		['name' => 'out_of_office#clearOutOfOffice', 'url' => '/api/v1/outOfOffice/{userId}', 'verb' => 'DELETE'],
-	],
+    'routes' => [
+        ['name' => 'birthday_calendar#enable', 'url' => '/enableBirthdayCalendar', 'verb' => 'POST'],
+        ['name' => 'birthday_calendar#disable', 'url' => '/disableBirthdayCalendar', 'verb' => 'POST'],
+        ['name' => 'invitation_response#accept', 'url' => '/invitation/accept/{token}', 'verb' => 'GET'],
+        ['name' => 'invitation_response#decline', 'url' => '/invitation/decline/{token}', 'verb' => 'GET'],
+        ['name' => 'invitation_response#options', 'url' => '/invitation/moreOptions/{token}', 'verb' => 'GET'],
+        ['name' => 'invitation_response#processMoreOptionsResult', 'url' => '/invitation/moreOptions/{token}', 'verb' => 'POST'],
+    ],
+    'ocs' => [
+        ['name' => 'direct#getUrl', 'url' => '/api/v1/direct', 'verb' => 'POST'],
+        ['name' => 'upcoming_events#getEvents', 'url' => '/api/v1/events/upcoming', 'verb' => 'GET'],
+        ['name' => 'out_of_office#getCurrentOutOfOfficeData', 'url' => '/api/v1/outOfOffice/{userId}/now', 'verb' => 'GET'],
+        ['name' => 'out_of_office#getOutOfOffice', 'url' => '/api/v1/outOfOffice/{userId}', 'verb' => 'GET'],
+        ['name' => 'out_of_office#setOutOfOffice', 'url' => '/api/v1/outOfOffice/{userId}', 'verb' => 'POST'],
+        ['name' => 'out_of_office#clearOutOfOffice', 'url' => '/api/v1/outOfOffice/{userId}', 'verb' => 'DELETE'],
+    ],
 ];