Merge pull request #774 from nextcloud/bugfix/771/rest-types

Fix numeric types and missing card id in card detail results

lib/Controller/BoardApiController.php

@@ -24,12 +24,14 @@
 
 namespace OCA\Deck\Controller;
 
+use OCA\Deck\StatusException;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
 
 use OCA\Deck\Service\BoardService;
+use Sabre\HTTP\Util;
 
 /**
  * Class BoardApiController
@@ -61,10 +63,14 @@ class BoardApiController extends ApiController {
 	 */
 	public function index() {
 		$modified = $this->request->getHeader('If-Modified-Since');
-		if ($modified === '') {
+		if ($modified === null || $modified === '') {
 			$boards = $this->service->findAll();
 		} else {
-			$boards = $this->service->findAll(strtotime($modified));
+			$date = Util::parseHTTPDate($modified);
+			if (!$date) {
+				throw new StatusException('Invalid If-Modified-Since header provided.');
+			}
+			$boards = $this->service->findAll($date->getTimestamp());
 		}
 		return new DataResponse($boards, HTTP::STATUS_OK);
 	 }

lib/Controller/StackApiController.php

@@ -24,12 +24,14 @@
 
 namespace OCA\Deck\Controller;
 
+use OCA\Deck\StatusException;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\IRequest;
 use OCA\Deck\Service\StackService;
 use OCA\Deck\Service\BoardService;
+use Sabre\HTTP\Util;
 
 /**
  * Class StackApiController
@@ -62,8 +64,12 @@ class StackApiController extends ApiController {
 	public function index() {
 		$since = 0;
 		$modified = $this->request->getHeader('If-Modified-Since');
-		if ($modified !== '') {
+		if ($modified !== null && $modified !== '') {
-			$since = strtotime($modified);
+			$date = Util::parseHTTPDate($modified);
+			if (!$date) {
+				throw new StatusException('Invalid If-Modified-Since header provided.');
+			}
+			$since = $date->getTimestamp();
 		}
 		$stacks = $this->stackService->findAll($this->request->getParam('boardId'), $since);
 		return new DataResponse($stacks, HTTP::STATUS_OK);

lib/Db/AssignedUsers.php

@@ -33,8 +33,8 @@ class AssignedUsers extends RelationalEntity implements JsonSerializable {
 
 	public function __construct() {
 		$this->addType('id', 'integer');
-		$this->addType('card_id', 'integer');
+		$this->addType('cardId', 'integer');
 		$this->addResolvable('participant');
 	}
 
-}
+}

lib/Db/Label.php

@@ -5,20 +5,20 @@
  * @author Julius Härtl <jus@bitgrid.net>
  *
  * @license GNU AGPL version 3 or any later version
- *  
+ *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU Affero General Public License as
  *  published by the Free Software Foundation, either version 3 of the
  *  License, or (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU Affero General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *  
+ *
  */
 
 namespace OCA\Deck\Db;
@@ -29,8 +29,10 @@ class Label extends RelationalEntity {
 	protected $color;
 	protected $boardId;
 	protected $cardId;
-	
+
 	public function __construct() {
 		$this->addType('id', 'integer');
+		$this->addType('boardId', 'integer');
+		$this->addType('cardId', 'integer');
 	}
-}
+}

lib/Db/LabelMapper.php

@@ -45,7 +45,7 @@ class LabelMapper extends DeckMapper implements IPermissionMapper {
 	}
 
 	public function findAssignedLabelsForCard($cardId, $limit = null, $offset = null) {
-		$sql = 'SELECT l.* FROM `*PREFIX*deck_assigned_labels` as al INNER JOIN *PREFIX*deck_labels as l ON l.id = al.label_id WHERE `card_id` = ? ORDER BY l.id';
+		$sql = 'SELECT l.*,card_id FROM `*PREFIX*deck_assigned_labels` as al INNER JOIN *PREFIX*deck_labels as l ON l.id = al.label_id WHERE `card_id` = ? ORDER BY l.id';
 		return $this->findEntities($sql, [$cardId], $limit, $offset);
 	}
 	public function findAssignedLabelsForBoard($boardId, $limit = null, $offset = null) {