Fix api routes

Signed-off-by: Julius Härtl <jus@bitgrid.net>

lib/Controller/DashboardApiController.php

@@ -25,6 +25,8 @@ namespace OCA\Deck\Controller;
 
 
 use OCA\Deck\Service\DashboardService;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\AppFramework\OCSController;
 use OCP\IRequest;
 use OCP\AppFramework\Controller;
 
@@ -40,17 +42,17 @@ class DashboardApiController extends OCSController {
 
 	/**
 	 * @NoAdminRequired
-	 * @return array
+	 * @return DataResponse
 	 */
 	public function findAllWithDue($userId) {
-		return $this->dashboardService->findAllWithDue($userId);
+		return new DataResponse($this->dashboardService->findAllWithDue($userId));
 	}
 
 	/**
 	 * @NoAdminRequired
-	 * @return array
+	 * @return DataResponse
 	 */
 	public function findAssignedCards($userId) {
-		return $this->dashboardService->findAssignedCards($userId);
+		return new DataResponse($this->dashboardService->findAssignedCards($userId));
 	}
 }

src/services/DashboardApi.js

@@ -26,12 +26,13 @@ import { generateOcsUrl, generateRemoteUrl } from '@nextcloud/router'
 export class DashboardApi {
 
 	url(url) {
-		url = `/apps/deck${url}`
-		return generateOcsUrl(url)
+		return generateOcsUrl(`apps/deck/api/v1.0`) + url
 	}
 
 	findAllWithDue(data) {
-		return axios.get(this.url(`/api/v1.0/dashboard/dashboard/due`))
+		return axios.get(this.url(`dashboard/dashboard/due`), {
+			headers: { 'OCS-APIRequest': 'true' },
+		})
 			.then(
 				(response) => Promise.resolve(response.data),
 				(err) => Promise.reject(err)
@@ -41,7 +42,9 @@ export class DashboardApi {
 	}
 
 	findMyAssignedCards(data) {
-		return axios.get(this.url(`/ocs/v2.php/apps/deck/api/v1.0/dashboard/assigned`))
+		return axios.get(this.url(`dashboard/assigned`), {
+			headers: { 'OCS-APIRequest': 'true' },
+		})
 			.then(
 				(response) => Promise.resolve(response.data),
 				(err) => Promise.reject(err)