fixup! feat: OCC and OCS Calendar Import/Export

Signed-off-by: SebastianKrupinski <krupinskis05@gmail.com>
nextcloud · Feb 20, 2025 · 3d1a745 · 3d1a745
1 parent e36b88a
commit 3d1a745
Show file tree

Hide file tree

Showing 6 changed files with 466 additions and 196 deletions.
diff --git a/apps/dav/lib/Controller/CalendarExportController.php b/apps/dav/lib/Controller/CalendarExportController.php
@@ -10,14 +10,14 @@
 
 use OCA\DAV\AppInfo\Application;
 use OCA\DAV\CalDAV\Export\ExportService;
-use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\ApiRoute;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\OpenAPI;
 use OCP\AppFramework\Http\Attribute\UserRateLimit;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\StreamGeneratorResponse;
+use OCP\AppFramework\OCSController;
 use OCP\Calendar\CalendarExportOptions;
 use OCP\Calendar\ICalendarExport;
 use OCP\Calendar\IManager;
@@ -26,7 +26,7 @@
 use OCP\IUserManager;
 use OCP\IUserSession;
 
-class CalendarExportController extends ApiController {
+class CalendarExportController extends OCSController {
 
 	public function __construct(
 		IRequest $request,
@@ -47,14 +47,13 @@ public function __construct(
 	 * @param array<string,mixed> $options configuration options
 	 * @param string|null $user system user id
 	 *
-	 * @return DataResponse<Http::STATUS_BAD_REQUEST|Http::STATUS_UNAUTHORIZED,array{error?:non-empty-string},array{}>|\OCP\AppFramework\Http\StreamGeneratorResponse
+	 * @return DataResponse<Http::STATUS_BAD_REQUEST|Http::STATUS_UNAUTHORIZED,array{error?:non-empty-string},array{}>|StreamGeneratorResponse<Http::STATUS_OK,array{Content-Type:string}>
 	 *
 	 * 200: calendar data
 	 * 401: user not authorized
 	 * 400: invalid parameters
 	 */
 	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
-	#[ApiRoute(verb: 'GET', url: '/export', root: '/calendar')]
 	#[ApiRoute(verb: 'POST', url: '/export', root: '/calendar')]
 	#[UserRateLimit(limit: 1, period: 60)]
 	#[NoAdminRequired]

diff --git a/apps/dav/lib/Controller/CalendarImportController.php b/apps/dav/lib/Controller/CalendarImportController.php
@@ -10,13 +10,13 @@
 
 use OCA\DAV\AppInfo\Application;
 use OCA\DAV\CalDAV\Import\ImportService;
-use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\ApiRoute;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\OpenAPI;
 use OCP\AppFramework\Http\Attribute\UserRateLimit;
 use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCSController;
 use OCP\Calendar\CalendarImportOptions;
 use OCP\Calendar\ICalendarImport;
 use OCP\Calendar\ICalendarIsWritable;
@@ -26,7 +26,7 @@
 use OCP\IUserManager;
 use OCP\IUserSession;
 
-class CalendarImportController extends ApiController {
+class CalendarImportController extends OCSController {
 
 	public function __construct(
 		IRequest $request,
@@ -47,9 +47,10 @@ public function __construct(
 	 * @param string $data calendar data
 	 * @param string|null $user system user id
 	 *
-	 * @return DataResponse<Http::STATUS_OK|Http::STATUS_BAD_REQUEST|Http::STATUS_UNAUTHORIZED|Http::STATUS_INTERNAL_SERVER_ERROR,array{created?:int<0,max>,error?:string,errors?:int<0,max>,skipped?:int<0,max>,time?:float,updated?:int<0,max>},array<never,never>>
+	 * @return DataResponse<Http::STATUS_OK|Http::STATUS_BAD_REQUEST|Http::STATUS_UNAUTHORIZED|Http::STATUS_INTERNAL_SERVER_ERROR,array{created?:int<0,max>,error?:string,errors?:int<0,max>,skipped?:int<0,max>,time?:float,updated?:int<0,max>},array{}>
 	 *
 	 * 200: calendar data
+	 * 400: invalid request
 	 * 401: user not authorized
 	 * 404: calendar not found
 	 * 404: format not found