fix(OOO): Make the returned data more explicit

Signed-off-by: Joas Schilling <coding@schilljs.com>

diff --git a/apps/dav/lib/Controller/OutOfOfficeController.php b/apps/dav/lib/Controller/OutOfOfficeController.php
index fe4200ee1b59d5b4b796d6babce3e5a2c760793a..e86f116c3b1028435b9c2680e2591d649a50c74e 100644 (file)
--- a/apps/dav/lib/Controller/OutOfOfficeController.php
+++ b/apps/dav/lib/Controller/OutOfOfficeController.php
@@ -30,6 +30,7 @@ use OCA\DAV\Db\AbsenceMapper;
 use OCA\DAV\ResponseDefinitions;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Http;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCSController;
 use OCP\IRequest;
@@ -50,15 +51,13 @@ class OutOfOfficeController extends OCSController {
        /**
         * Get the currently configured out-of-office data of a user.
         *
-        * @NoAdminRequired
-        * @NoCSRFRequired
-        *
         * @param string $userId The user id to get out-of-office data for.
-        * @return DataResponse<Http::STATUS_OK|Http::STATUS_NOT_FOUND, ?DAVOutOfOfficeData, array{}>
+        * @return DataResponse<Http::STATUS_OK, DAVOutOfOfficeData, array{}>|DataResponse<Http::STATUS_NOT_FOUND, null, array{}>
         *
         * 200: Out-of-office data
         * 404: No out-of-office data was found
         */
+       #[NoAdminRequired]
        public function getCurrentOutOfOfficeData(string $userId): DataResponse {
                try {
                        $data = $this->absenceMapper->findByUserId($userId);

diff --git a/apps/dav/openapi.json b/apps/dav/openapi.json
index 994d0cde11ddcdd4543651cc1419be08cce34f49..c8ae5a9620648790a821be487a24538e3288ac3a 100644 (file)
--- a/apps/dav/openapi.json
+++ b/apps/dav/openapi.json
@@ -277,8 +277,7 @@
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
                                                 "data": {
-                                                    "$ref": "#/components/schemas/OutOfOfficeData",
-                                                    "nullable": true
+                                                    "$ref": "#/components/schemas/OutOfOfficeData"
                                                 }
                                             }
                                         }
@@ -308,7 +307,6 @@
                                                     "$ref": "#/components/schemas/OCSMeta"
                                                 },
                                                 "data": {
-                                                    "$ref": "#/components/schemas/OutOfOfficeData",
                                                     "nullable": true
                                                 }
                                             }