Update logger, moving from XML payload to json (#352)

* upgrade to nextcloud 31

Signed-off-by: Fabrice Meyer <meyer.fabrice@gmx.fr>

* remove useless XMLResponse lib

Signed-off-by: Fabrice Meyer <meyer.fabrice@gmx.fr>

---------

Signed-off-by: Fabrice Meyer <meyer.fabrice@gmx.fr>

Author: chadek

appinfo/routes.php

@@ -12,7 +12,7 @@
 
 		['name' => 'CoAuthoring#command', 'url' => '/coauthoring/CommandService.ashx', 'verb' => 'POST'],
 
-		['name' => 'Convert#convert', 'url' => '/ConvertService.ashx', 'verb' => 'POST'],
+		['name' => 'Convert#convert', 'url' => '/converter', 'verb' => 'POST'],
 
 		['name' => 'Static#webApps', 'url' => '/web-apps/{path}', 'verb' => 'GET', 'requirements' => ['path' => '.+']],
 		['name' => 'Static#pluginsJSON', 'url' => '/plugins.json', 'verb' => 'GET'],

lib/Controller/CoAuthoringController.php

@@ -23,21 +23,22 @@
 
 namespace OCA\DocumentServer\Controller;
 
+use OCP\AppFramework\Http\DataResponse;
 use OCA\DocumentServer\OnlyOffice\WebVersion;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\PublicPage;
 
 class CoAuthoringController extends Controller {
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 */
+    #[NoAdminRequired]
+    #[NoCSRFRequired]
+    #[PublicPage]
 	public function command(string $c) {
 		switch ($c) {
 			case 'version':
 				$webVersion = new WebVersion();
-
-				return ['version' => $webVersion->getWebUIVersion(), 'error' => 0];
+				return new DataResponse(['version' => $webVersion->getWebUIVersion(), 'error' => 0]);
 			default:
 				return ['error' => 5];
 		}

lib/Controller/ConvertController.php

@@ -25,8 +25,11 @@
 
 use OCA\DocumentServer\Document\DocumentStore;
 use OCA\DocumentServer\OnlyOffice\URLDecoder;
-use OCA\DocumentServer\XMLResponse;
+use OCA\DocumentServer\JSONResponse;
 use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\IURLGenerator;
 
 class ConvertController extends Controller {
@@ -41,14 +44,12 @@ public function __construct(DocumentStore $documentStore, URLDecoder $urlDecoder
 	}
 
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 */
+    #[NoAdminRequired]
+    #[NoCSRFRequired]
+    #[PublicPage]
 	public function convert(bool $async, string $url, string $outputtype, string $filetype, string $title, string $key) {
 		if ($outputtype === $filetype) {
-			return new XMLResponse([
+			return new JSONResponse([
 				'FileUrl' => $url,
 				'Percent' => "100",
 				'EndConvert' => "True",
@@ -66,7 +67,7 @@ public function convert(bool $async, string $url, string $outputtype, string $fi
 				]
 			);
 
-			return new XMLResponse([
+			return new JSONResponse([
 				'FileUrl' => $url,
 				'Percent' => "100",
 				'EndConvert' => "True",

lib/Controller/DocumentController.php

@@ -40,6 +40,9 @@
 use OCA\DocumentServer\XHRCommand\UnlockDocument;
 use OCA\DocumentServer\XHRCommand\OpenDocument;
 use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
+use OCP\AppFramework\Http\Attribute\PublicPage;
 use OCP\IRequest;
 use OCP\IURLGenerator;
 use OCP\Security\ISecureRandom;
@@ -115,20 +118,17 @@ protected function getIdleHandlerClasses(): array {
 		return self::IDLE_HANDLERS;
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
+	#[PublicPage]
 	public function healthCheck() {
-		return true;
+		return new DataResponse(true);
+                //return true;
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
+	#[PublicPage]
 	public function documentFile(int $docId, string $path, ?bool $download) {
 		$file = $this->documentStore->openDocumentFile($docId, $path);
 
@@ -146,11 +146,9 @@ public function documentFile(int $docId, string $path, ?bool $download) {
 		return $response;
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
+	#[PublicPage]
 	public function upload(int $docId, string $index) {
 		$content = fopen('php://input', 'r');
 		$mime = $this->request->getHeader('Content-Type');
@@ -170,11 +168,9 @@ public function upload(int $docId, string $index) {
 		]);
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 * @PublicPage
-	 */
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
+	#[PublicPage]
 	public function download(int $docId, string $cmd) {
 		$cmd = json_decode($cmd, true);
 		$content = fopen('php://input', 'r');

lib/XMLResponse.php lib/JSONResponse.phplib/XMLResponse.php renamed to lib/JSONResponse.php

@@ -26,37 +26,37 @@
 use OC\AppFramework\Http;
 use OCP\AppFramework\Http\Response;
 
-class XMLResponse extends Response {
-
-	/**
-	 * response data
-	 *
-	 * @var array|object
-	 */
-	protected $data;
-
-	public function __construct($data = [], $statusCode = Http::STATUS_OK) {
-		parent::__construct();
-
-		$this->data = $data;
-		$this->setStatus($statusCode);
-		$this->addHeader('Content-Type', 'application/xml; charset=utf-8');
-	}
-
-	public function render() {
-		$xml = new \SimpleXMLElement('<root/>');
-		$data = array_flip($this->data);
-		array_walk_recursive($data, [$xml, 'addChild']);
-		return $xml->asXML();
-	}
-
-	public function setData($data) {
-		$this->data = $data;
-
-		return $this;
-	}
-
-	public function getData() {
-		return $this->data;
-	}
+
+class JSONResponse extends Response {
+
+    /**
+     * response data
+     *
+     * @var array|object
+     */
+    protected $data;
+
+    public function __construct($data = [], $statusCode = Http::STATUS_OK) {
+        parent::__construct();
+
+        $this->data = $data;
+        $this->setStatus($statusCode);
+        $this->addHeader('Content-Type', 'application/json; charset=utf-8');
+    }
+
+    public function render() {
+        // Convert the data to JSON format and return it
+        $data = array_flip($this->data);
+        return json_encode($this->data);
+    }
+
+    public function setData($data) {
+        $this->data = $data;
+
+        return $this;
+    }
+
+    public function getData() {
+        return $this->data;
+    }
 }