Mirrors/sysPass
2
0
Fork 0
mirror of https://github.com/nuxsmin/sysPass.git synced 2026-03-24 00:57:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

* [FIX] Wrong behavior when searching for items through the API. Thanks to @GGOUSSEAUD for the feedback and testing. Related #1000

Browse Source 
* [MOD] Improved API help. Related #1004
* [MOD] Code refactoring
This commit is contained in:
nuxsmin
2018-08-09 13:43:02 +02:00
parent 617c3b5e84
commit e28ec274e0
16 changed files with 621 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/modules/api/Controllers/CategoryController.php
View File

@@ -29,6 +29,7 @@ use SP\Core\Events\Event;
use SP\Core\Events\EventMessage;
use SP\DataModel\CategoryData;
use SP\DataModel\ItemSearchData;
use SP\Modules\Api\Controllers\Help\CategoryHelp;
use SP\Services\Api\ApiResponse;
use SP\Services\Category\CategoryService;
@@ -43,7 +44,7 @@ final class CategoryController extends ControllerBase
/**
* @var CategoryService
*/
protected $categoryService;
private $categoryService;
/**
* viewAction
@@ -62,9 +63,9 @@ final class CategoryController extends ControllerBase
$this->returnResponse(new ApiResponse($categoryData));
} catch (\Exception $e) {
$this->returnResponseException($e);
processException($e);
$this->returnResponseException($e);
}
}
@@ -90,9 +91,9 @@ final class CategoryController extends ControllerBase
$this->returnResponse(new ApiResponse(__('Categoría creada'), ApiResponse::RESULT_SUCCESS, $id));
} catch (\Exception $e) {
$this->returnResponseException($e);
processException($e);
$this->returnResponseException($e);
}
}
@@ -119,9 +120,9 @@ final class CategoryController extends ControllerBase
$this->returnResponse(new ApiResponse(__('Categoría actualizada'), ApiResponse::RESULT_SUCCESS, $categoryData->getId()));
} catch (\Exception $e) {
$this->returnResponseException($e);
processException($e);
$this->returnResponseException($e);
}
}
@@ -147,9 +148,9 @@ final class CategoryController extends ControllerBase
$this->returnResponse(new ApiResponse(__('Categoría eliminada'), ApiResponse::RESULT_SUCCESS, $id));
} catch (\Exception $e) {
$this->returnResponseException($e);
processException($e);
$this->returnResponseException($e);
}
}
@@ -167,20 +168,22 @@ final class CategoryController extends ControllerBase
$this->eventDispatcher->notifyEvent('search.category', new Event($this));
$this->returnResponse(new ApiResponse($this->categoryService->search($itemSearchData)));
$this->returnResponse(new ApiResponse($this->categoryService->search($itemSearchData)->getDataAsArray()));
} catch (\Exception $e) {
$this->returnResponseException($e);
processException($e);
$this->returnResponseException($e);
}
}
/**
* @throws \DI\DependencyException
* @throws \DI\NotFoundException
* initialize
*
* @throws \SP\Core\Exceptions\InvalidClassException
*/
protected function initialize()
{
$this->categoryService = $this->dic->get(CategoryService::class);
$this->apiService->setHelpClass(CategoryHelp::class);
}
}