Skip to content

fix(dav): Prioritize timezone from core/login #41866

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.

Sign up for GitHub

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

Merged
ChristophWurst merged 1 commit into from
Nov 29, 2023
Merged

fix(dav): Prioritize timezone from core/login #41866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions apps/dav/lib/CalDAV/TimezoneService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,15 @@ public function __construct(private IConfig $config,
}

public function getUserTimezone(string $userId): ?string {
$fromConfig = $this->config->getUserValue(
$userId,
'core',
'timezone',
);
if ($fromConfig !== '') {
Copy link
Member

@tcitworld tcitworld Nov 29, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to say that the value might not be a valid timezone ID, but someone fixed that a couple of months ago. #36001 🙈

Older values might still be bad though, as I didn't add a repair step.

Copy link
Member Author

@ChristophWurst ChristophWurst Nov 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good enough IMO. The value is set at every login.

return $fromConfig;
}

$availabilityPropPath = 'calendars/' . $userId . '/inbox';
$availabilityProp = '{' . Plugin::NS_CALDAV . '}calendar-availability';
$availabilities = $this->propertyMapper->findPropertyByPathAndName($userId, $availabilityPropPath, $availabilityProp);
Expand Down
31 changes: 25 additions & 6 deletions apps/dav/tests/unit/CalDAV/TimezoneServiceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,22 @@ protected function setUp(): void {
);
}

public function testGetUserTimezoneFromSettings(): void {
$this->config->expects(self::once())
->method('getUserValue')
->with('test123', 'core', 'timezone', '')
->willReturn('Europe/Warsaw');

$timezone = $this->service->getUserTimezone('test123');

self::assertSame('Europe/Warsaw', $timezone);
}

public function testGetUserTimezoneFromAvailability(): void {
$this->config->expects(self::once())
->method('getUserValue')
->with('test123', 'core', 'timezone', '')
->willReturn('');
$property = new Property();
$property->setPropertyvalue('BEGIN:VCALENDAR
PRODID:Nextcloud DAV app
Expand All @@ -99,10 +114,12 @@ public function testGetUserTimezoneFromAvailability(): void {
}

public function testGetUserTimezoneFromPersonalCalendar(): void {
$this->config->expects(self::once())
$this->config->expects(self::exactly(2))
->method('getUserValue')
->with('test123', 'dav', 'defaultCalendar')
->willReturn('personal-1');
->willReturnMap([
['test123', 'core', 'timezone', '', ''],
['test123', 'dav', 'defaultCalendar', '', 'personal-1'],
]);
$other = $this->createMock(ICalendar::class);
$other->method('getUri')->willReturn('other');
$personal = $this->createMock(CalendarImpl::class);
Expand All @@ -126,10 +143,12 @@ public function testGetUserTimezoneFromPersonalCalendar(): void {
}

public function testGetUserTimezoneFromAny(): void {
$this->config->expects(self::once())
$this->config->expects(self::exactly(2))
->method('getUserValue')
->with('test123', 'dav', 'defaultCalendar')
->willReturn('personal-1');
->willReturnMap([
['test123', 'core', 'timezone', '', ''],
['test123', 'dav', 'defaultCalendar', '', 'personal-1'],
]);
$other = $this->createMock(ICalendar::class);
$other->method('getUri')->willReturn('other');
$personal = $this->createMock(CalendarImpl::class);
Expand Down