-
Notifications
You must be signed in to change notification settings - Fork 250
feat: create example event when a user logs in for the first time #6648
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
st3iny
wants to merge
6
commits into
main
Choose a base branch
from
feat/example-event
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
73f2d0c
feat: create example event when a user logs in for the first time
st3iny d8575da
fixup! feat: create example event when a user logs in for the first time
st3iny 7905ceb
fixup! feat: create example event when a user logs in for the first time
st3iny 54fef58
fixup! feat: create example event when a user logs in for the first time
st3iny 29b0664
fixup! feat: create example event when a user logs in for the first time
st3iny 1b7de04
fixup! feat: create example event when a user logs in for the first time
st3iny File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
/** | ||
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors | ||
* SPDX-License-Identifier: AGPL-3.0-or-later | ||
*/ | ||
|
||
namespace OCA\Calendar\Controller; | ||
|
||
use OCA\Calendar\AppInfo\Application; | ||
use OCA\Calendar\Http\JsonResponse; | ||
use OCA\Calendar\Service\ExampleEventService; | ||
use OCP\AppFramework\Controller; | ||
use OCP\AppFramework\Http; | ||
use OCP\AppFramework\Http\Attribute\FrontpageRoute; | ||
use OCP\IRequest; | ||
|
||
class ExampleEventController extends Controller { | ||
public function __construct( | ||
IRequest $request, | ||
private readonly ExampleEventService $exampleEventService, | ||
) { | ||
parent::__construct(Application::APP_ID, $request); | ||
} | ||
|
||
#[FrontpageRoute(verb: 'POST', url: '/v1/exampleEvent/enable')] | ||
public function setCreateExampleEvent(bool $enable): JSONResponse { | ||
$this->exampleEventService->setCreateExampleEvent($enable); | ||
return JsonResponse::success([]); | ||
} | ||
|
||
#[FrontpageRoute(verb: 'POST', url: '/v1/exampleEvent/event')] | ||
public function uploadExampleEvent(string $ics): JSONResponse { | ||
if (!$this->exampleEventService->shouldCreateExampleEvent()) { | ||
return JSONResponse::fail([], Http::STATUS_FORBIDDEN); | ||
} | ||
|
||
$this->exampleEventService->saveCustomExampleEvent($ics); | ||
return JsonResponse::success([]); | ||
} | ||
|
||
#[FrontpageRoute(verb: 'DELETE', url: '/v1/exampleEvent/event')] | ||
public function deleteExampleEvent(): JSONResponse { | ||
$this->exampleEventService->deleteCustomExampleEvent(); | ||
return JsonResponse::success([]); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
/** | ||
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors | ||
* SPDX-License-Identifier: AGPL-3.0-or-later | ||
*/ | ||
|
||
namespace OCA\Calendar\Listener; | ||
|
||
use OCA\Calendar\Exception\ServiceException; | ||
use OCA\Calendar\Service\ExampleEventService; | ||
use OCA\Calendar\Service\NextcloudVersionService; | ||
use OCP\EventDispatcher\Event; | ||
use OCP\EventDispatcher\IEventListener; | ||
use OCP\User\Events\UserFirstTimeLoggedInEvent; | ||
use Psr\Log\LoggerInterface; | ||
|
||
/** @template-implements IEventListener<UserFirstTimeLoggedInEvent> */ | ||
class UserFirstLoginListener implements IEventListener { | ||
public function __construct( | ||
private readonly ExampleEventService $exampleEventService, | ||
private readonly LoggerInterface $logger, | ||
private readonly NextcloudVersionService $versionService, | ||
) { | ||
} | ||
|
||
public function handle(Event $event): void { | ||
if (!($event instanceof UserFirstTimeLoggedInEvent)) { | ||
return; | ||
} | ||
|
||
// TODO: drop condition once we only support Nextcloud >= 31 | ||
if (!$this->versionService->is31OrAbove()) { | ||
return; | ||
} | ||
|
||
if (!$this->exampleEventService->shouldCreateExampleEvent()) { | ||
return; | ||
} | ||
|
||
$userId = $event->getUser()->getUID(); | ||
try { | ||
$this->exampleEventService->createExampleEvent($userId); | ||
} catch (ServiceException $e) { | ||
$this->logger->error( | ||
"Failed to create example event for user $userId: " . $e->getMessage(), | ||
[ | ||
'exception' => $e, | ||
'userId' => $userId, | ||
], | ||
); | ||
} | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,177 @@ | ||
<?php | ||
|
||
declare(strict_types=1); | ||
|
||
/** | ||
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors | ||
* SPDX-License-Identifier: AGPL-3.0-or-later | ||
*/ | ||
|
||
namespace OCA\Calendar\Service; | ||
|
||
use OCA\Calendar\AppInfo\Application; | ||
use OCA\Calendar\Exception\ServiceException; | ||
use OCP\AppFramework\Utility\ITimeFactory; | ||
use OCP\Calendar\ICreateFromString; | ||
use OCP\Calendar\IManager as ICalendarManager; | ||
use OCP\Files\IAppData; | ||
use OCP\Files\NotFoundException; | ||
use OCP\Files\NotPermittedException; | ||
use OCP\IAppConfig; | ||
use OCP\Security\ISecureRandom; | ||
use Sabre\VObject\Component\VCalendar; | ||
use Sabre\VObject\Component\VEvent; | ||
|
||
class ExampleEventService { | ||
private const FOLDER_NAME = 'example_event'; | ||
private const FILE_NAME = 'example_event.ics'; | ||
private const ENABLE_CONFIG_KEY = 'create_example_event'; | ||
|
||
public function __construct( | ||
private readonly ICalendarManager $calendarManager, | ||
private readonly ISecureRandom $random, | ||
private readonly ITimeFactory $time, | ||
private readonly IAppData $appData, | ||
private readonly IAppConfig $appConfig, | ||
) { | ||
} | ||
|
||
public function createExampleEvent(string $userId): void { | ||
$calendars = $this->calendarManager->getCalendarsForPrincipal("principals/users/$userId"); | ||
if ($calendars === []) { | ||
throw new ServiceException("User $userId has no calendars"); | ||
} | ||
|
||
/** @var ICreateFromString $firstCalendar */ | ||
$firstCalendar = $calendars[0]; | ||
|
||
$customIcs = $this->getCustomExampleEvent(); | ||
if ($customIcs === null) { | ||
$this->createDefaultEvent($firstCalendar); | ||
return; | ||
} | ||
|
||
// TODO: parsing should be handled inside OCP | ||
try { | ||
$vCalendar = \Sabre\VObject\Reader::read($customIcs); | ||
if (!($vCalendar instanceof VCalendar)) { | ||
throw new ServiceException('Custom event does not contain a VCALENDAR component'); | ||
} | ||
|
||
/** @var VEvent|null $vEvent */ | ||
$vEvent = $vCalendar->getBaseComponent('VEVENT'); | ||
if ($vEvent === null) { | ||
throw new ServiceException('Custom event does not contain a VEVENT component'); | ||
} | ||
} catch (\Exception $e) { | ||
throw new ServiceException('Failed to parse custom event: ' . $e->getMessage(), 0, $e); | ||
} | ||
|
||
$uid = $this->random->generate(32, ISecureRandom::CHAR_ALPHANUMERIC); | ||
$vEvent->UID = $uid; | ||
$vEvent->DTSTART = $this->getStartDate(); | ||
$vEvent->DTEND = $this->getEndDate(); | ||
$vEvent->remove('ORGANIZER'); | ||
$vEvent->remove('ATTENDEE'); | ||
$firstCalendar->createFromString("$uid.ics", $vCalendar->serialize()); | ||
} | ||
|
||
private function getStartDate(): \DateTimeInterface { | ||
return $this->time->now() | ||
->add(new \DateInterval('P7D')) | ||
->setTime(10, 00); | ||
} | ||
|
||
private function getEndDate(): \DateTimeInterface { | ||
return $this->time->now() | ||
->add(new \DateInterval('P7D')) | ||
->setTime(11, 00); | ||
} | ||
|
||
private function createDefaultEvent(ICreateFromString $calendar): void { | ||
$defaultDescription = <<<EOF | ||
Welcome to Nextcloud Calendar! | ||
|
||
This is a sample event - explore the flexibility of planning with Nextcloud Calendar by making any edits you want! | ||
|
||
With Nextcloud Calendar, you can: | ||
- Create, edit, and manage events effortlessly. | ||
- Create multiple calendars and share them with teammates, friends, or family. | ||
- Check availability and display your busy times to others. | ||
- Seamlessly integrate with apps and devices via CalDAV. | ||
- Customize your experience: schedule recurring events, adjust notifications and other settings. | ||
EOF; | ||
|
||
$eventBuilder = $this->calendarManager->createEventBuilder(); | ||
$eventBuilder->setSummary('Example event - open me!'); | ||
$eventBuilder->setDescription($defaultDescription); | ||
$eventBuilder->setStartDate($this->getStartDate()); | ||
$eventBuilder->setEndDate($this->getEndDate()); | ||
$eventBuilder->createInCalendar($calendar); | ||
} | ||
|
||
/** | ||
* @return string|null The ics of the custom example event or null if no custom event was uploaded. | ||
* @throws ServiceException If reading the custom ics file fails. | ||
*/ | ||
private function getCustomExampleEvent(): ?string { | ||
try { | ||
$folder = $this->appData->getFolder(self::FOLDER_NAME); | ||
$icsFile = $folder->getFile(self::FILE_NAME); | ||
} catch (NotFoundException $e) { | ||
return null; | ||
} | ||
|
||
try { | ||
return $icsFile->getContent(); | ||
} catch (NotFoundException|NotPermittedException $e) { | ||
throw new ServiceException( | ||
'Failed to read custom example event', | ||
0, | ||
$e, | ||
); | ||
} | ||
} | ||
|
||
public function saveCustomExampleEvent(string $ics): void { | ||
try { | ||
$folder = $this->appData->getFolder(self::FOLDER_NAME); | ||
} catch (NotFoundException $e) { | ||
$folder = $this->appData->newFolder(self::FOLDER_NAME); | ||
} | ||
|
||
try { | ||
$existingFile = $folder->getFile(self::FILE_NAME); | ||
$existingFile->putContent($ics); | ||
} catch (NotFoundException $e) { | ||
$folder->newFile(self::FILE_NAME, $ics); | ||
} | ||
} | ||
|
||
public function deleteCustomExampleEvent(): void { | ||
try { | ||
$folder = $this->appData->getFolder(self::FOLDER_NAME); | ||
$file = $folder->getFile(self::FILE_NAME); | ||
} catch (NotFoundException $e) { | ||
return; | ||
} | ||
|
||
$file->delete(); | ||
} | ||
|
||
public function hasCustomExampleEvent(): bool { | ||
try { | ||
return $this->getCustomExampleEvent() !== null; | ||
} catch (ServiceException $e) { | ||
return false; | ||
} | ||
} | ||
|
||
public function setCreateExampleEvent(bool $enable) { | ||
$this->appConfig->setValueBool(Application::APP_ID, self::ENABLE_CONFIG_KEY, $enable); | ||
} | ||
|
||
public function shouldCreateExampleEvent(): bool { | ||
return $this->appConfig->getValueBool(Application::APP_ID, self::ENABLE_CONFIG_KEY, true); | ||
} | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
@@ -0,0 +1,41 @@ | ||||||
<?php | ||||||
|
||||||
declare(strict_types=1); | ||||||
|
||||||
/** | ||||||
* SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors | ||||||
* SPDX-License-Identifier: AGPL-3.0-or-later | ||||||
*/ | ||||||
|
||||||
namespace OCA\Calendar\Service; | ||||||
|
||||||
use OCP\ServerVersion; | ||||||
use Psr\Container\ContainerExceptionInterface; | ||||||
use Psr\Container\ContainerInterface; | ||||||
|
||||||
class NextcloudVersionService { | ||||||
private ?ServerVersion $serverVersion; | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
|
||||||
|
||||||
public function __construct( | ||||||
private readonly ContainerInterface $container, | ||||||
) { | ||||||
} | ||||||
|
||||||
private function getMajorVersion(): int { | ||||||
if ($this->serverVersion === null) { | ||||||
// ServerVersion was added in 31, but we don't care about older versions anyway | ||||||
try { | ||||||
/** @var ServerVersion $serverVersion */ | ||||||
$this->serverVersion = $this->container->get(ServerVersion::class); | ||||||
} catch (ContainerExceptionInterface $e) { | ||||||
return 0; | ||||||
} | ||||||
} | ||||||
|
||||||
return $this->serverVersion->getMajorVersion(); | ||||||
} | ||||||
|
||||||
public function is31OrAbove(): bool { | ||||||
return $this->getMajorVersion() >= 31; | ||||||
} | ||||||
} |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.