Skip to content

fix(dav): Handle long absence status earlier #51256

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
Mar 5, 2025
Merged

fix(dav): Handle long absence status earlier #51256

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
8 changes: 6 additions & 2 deletions apps/dav/lib/Controller/OutOfOfficeController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
use OCP\IUserManager;
use OCP\IUserSession;
use OCP\User\IAvailabilityCoordinator;
use function mb_strlen;

/**
* @psalm-import-type DAVOutOfOfficeData from ResponseDefinitions
Expand Down Expand Up @@ -107,10 +108,10 @@ public function getOutOfOffice(string $userId): DataResponse {
* @param string $message Longer multiline message that is shown to others during the absence
* @param ?string $replacementUserId User id of the replacement user
* @param ?string $replacementUserDisplayName Display name of the replacement user
* @return DataResponse<Http::STATUS_OK, DAVOutOfOfficeData, array{}>|DataResponse<Http::STATUS_BAD_REQUEST, array{error: 'firstDay'}, array{}>|DataResponse<Http::STATUS_UNAUTHORIZED, null, array{}>|DataResponse<Http::STATUS_NOT_FOUND, null, array{}>
* @return DataResponse<Http::STATUS_OK, DAVOutOfOfficeData, array{}>|DataResponse<Http::STATUS_BAD_REQUEST, array{error: 'firstDay'|'statusLength'}, array{}>|DataResponse<Http::STATUS_UNAUTHORIZED, null, array{}>|DataResponse<Http::STATUS_NOT_FOUND, null, array{}>
*
* 200: Absence data
* 400: When the first day is not before the last day
* 400: When validation fails, e.g. data range error or the first day is not before the last day
* 401: When the user is not logged in
* 404: When the replacementUserId was provided but replacement user was not found
*/
Expand All @@ -128,6 +129,9 @@ public function setOutOfOffice(
if ($user === null) {
return new DataResponse(null, Http::STATUS_UNAUTHORIZED);
}
if (mb_strlen($status) > 100) {
return new DataResponse(['error' => 'statusLength'], Http::STATUS_BAD_REQUEST);
}

if ($replacementUserId !== null) {
$replacementUser = $this->userManager->get($replacementUserId);
Expand Down
5 changes: 3 additions & 2 deletions apps/dav/openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,7 +793,7 @@
}
},
"400": {
"description": "When the first day is not before the last day",
"description": "When validation fails, e.g. data range error or the first day is not before the last day",
"content": {
"application/json": {
"schema": {
Expand Down Expand Up @@ -821,7 +821,8 @@
"error": {
"type": "string",
"enum": [
"firstDay"
"firstDay",
"statusLength"
]
}
}
Expand Down
Loading