ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix api routes

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-07-13 09:50:59 +02:00
parent 348fc669be
commit 014d7aa8ff
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Controller/DashboardApiController.php
View File

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

11
src/services/DashboardApi.js
View File

@@ -26,12 +26,13 @@ import { generateOcsUrl, generateRemoteUrl } from '@nextcloud/router'
export class DashboardApi { export class DashboardApi {
url(url) { url(url) {
url = `/apps/deck${url}` return generateOcsUrl(`apps/deck/api/v1.0`) + url
return generateOcsUrl(url)
} }
findAllWithDue(data) { 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( .then(
(response) => Promise.resolve(response.data), (response) => Promise.resolve(response.data),
(err) => Promise.reject(err) (err) => Promise.reject(err)
@@ -41,7 +42,9 @@ export class DashboardApi {
} }
findMyAssignedCards(data) { 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( .then(
(response) => Promise.resolve(response.data), (response) => Promise.resolve(response.data),
(err) => Promise.reject(err) (err) => Promise.reject(err)