fix(dav): data sent to token endpoint must be application/x-www-form-urlencoded

Signed-off-by: Enrique Pérez Arnaud <enrique@cazalla.net>

Author: enriquepablo

apps/dav/lib/Controller/TokenController.php

@@ -104,14 +104,7 @@ public function accessToken(): DataResponse {
 		}
 
 		$body = file_get_contents('php://input');
-		$data = json_decode($body, true);
-
-		if (!is_array($data)) {
-			return new DataResponse(
-				['error' => 'invalid_request'],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
+		parse_str($body, $data);
 
 		$refreshToken = $data['code'] ?? '';
 		$grantType = $data['grant_type'] ?? '';

lib/private/Files/Storage/DAV.php

@@ -27,6 +27,7 @@
 use OCP\IAppConfig;
 use OCP\ICertificateManager;
 use OCP\IConfig;
+use OCP\IURLGenerator;
 use OCP\OCM\Exceptions\OCMArgumentException;
 use OCP\OCM\Exceptions\OCMProviderException;
 use OCP\OCM\IOCMDiscoveryService;
@@ -114,6 +115,7 @@ class DAV extends Common {
 	protected ISignatureManager $signatureManager;
 	protected OCMSignatoryManager $signatoryManager;
 	protected IAppConfig $appConfig;
+	protected IURLGenerator $urlGenerator;
 
 	/** @var int */
 	private $timeout;
@@ -182,6 +184,7 @@ public function __construct(array $parameters) {
 		$this->signatureManager = Server::get(ISignatureManager::class);
 		$this->signatoryManager = Server::get(OCMSignatoryManager::class);
 		$this->appConfig = Server::get(IAppConfig::class);
+		$this->urlGenerator = Server::get(IURLGenerator::class);
 	}
 
 	protected function init(): void {
@@ -204,16 +207,17 @@ protected function init(): void {
 				}
 
 				$client = $this->httpClientService->newClient();
+				$clientId = parse_url($this->urlGenerator->getAbsoluteURL('/'), PHP_URL_HOST);
 				$payload = [
 					'grant_type' => 'authorization_code',
-					'client_id' => 'receiver.example.org',
+					'client_id' => $clientId,
 					'code' => $this->user,
 				];
 
 				$options = [
-					'body' => json_encode($payload),
+					'body' => http_build_query($payload),
 					'headers' => [
-						'Content-Type' => 'application/json',
+						'Content-Type' => 'application/x-www-form-urlencoded',
 					],
 					'timeout' => 10,
 					'connect_timeout' => 10,