Code cleanup on different API GET calls.
This commit is contained in:
@@ -12,7 +12,7 @@ class API_system_modules extends API
|
|||||||
{
|
{
|
||||||
list($query, $types, $params) = $this->buildDynamicQuery('system_modules');
|
list($query, $types, $params) = $this->buildDynamicQuery('system_modules');
|
||||||
|
|
||||||
$items = $this->generalGetFunction($query, $types, $params, $returnBoolean, 'Permission');
|
$items = $this->generalGetFunction($query, $types, $params, $returnBoolean, 'Modules');
|
||||||
|
|
||||||
return $items;
|
return $items;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ session_start();
|
|||||||
|
|
||||||
require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_companies.php';
|
require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_companies.php';
|
||||||
|
|
||||||
|
|
||||||
# Check permissions
|
# Check permissions
|
||||||
$API_companies = new API_companies();
|
$API_companies = new API_companies();
|
||||||
|
|
||||||
|
|||||||
@@ -8,16 +8,11 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_system_modules.php';
|
|||||||
$API_system_modules = new API_system_modules();
|
$API_system_modules = new API_system_modules();
|
||||||
|
|
||||||
if ($API_system_modules->request_method === 'GET') {
|
if ($API_system_modules->request_method === 'GET') {
|
||||||
# this part here is not tested (the whole GET part)
|
|
||||||
$API_system_modules->checkPermissions('admin-modules', 'RO');
|
$API_system_modules->checkPermissions('admin-modules', 'RO');
|
||||||
|
|
||||||
$requiredFields = [];
|
|
||||||
$API_system_modules->validateData($requiredFields);
|
|
||||||
|
|
||||||
$modules = $API_system_modules->getModules();
|
$modules = $API_system_modules->getModules();
|
||||||
|
|
||||||
$API_system_modules->apiOutput($code = 200, ['success' => $modules], '');
|
$API_system_modules->apiOutput($code = 200, ['success' => $modules], '');
|
||||||
|
|
||||||
} elseif ($API_system_modules->request_method === 'PUT') {
|
} elseif ($API_system_modules->request_method === 'PUT') {
|
||||||
# Enable or disable a module
|
# Enable or disable a module
|
||||||
$API_system_modules->checkPermissions('admin-modules', 'RW');
|
$API_system_modules->checkPermissions('admin-modules', 'RW');
|
||||||
|
|||||||
@@ -9,24 +9,11 @@ require_once $_SERVER['DOCUMENT_ROOT'] . '/api/classes/API_permissions.php';
|
|||||||
$API_permissions = new API_permissions();
|
$API_permissions = new API_permissions();
|
||||||
|
|
||||||
if ($API_permissions->request_method === 'GET') {
|
if ($API_permissions->request_method === 'GET') {
|
||||||
|
|
||||||
# Retrieve all the permissions a user and return them.
|
|
||||||
$API_permissions->checkPermissions('admin-access-control-permissions', 'RO');
|
$API_permissions->checkPermissions('admin-access-control-permissions', 'RO');
|
||||||
|
|
||||||
$requiredFields = [];
|
|
||||||
$optionalFields = [
|
|
||||||
'permission_uuid' => ['type' => 'uuid'],
|
|
||||||
'permission_name' => ['type' => 'string'],
|
|
||||||
'permission_slugify' => ['type' => 'slugify'],
|
|
||||||
'permission_description' => ['type' => 'string'],
|
|
||||||
'permission_create_timestamp' => ['type' => 'timestamp'],
|
|
||||||
'permission_modified_timestamp' => ['type' => 'timestamp']
|
|
||||||
];
|
|
||||||
$API_permissions->validateData($requiredFields, $optionalFields);
|
|
||||||
$permissions = $API_permissions->getPermission();
|
$permissions = $API_permissions->getPermission();
|
||||||
|
|
||||||
$API_permissions->apiOutput($code = 200, $permissions, 'permission_retrieved');
|
$API_permissions->apiOutput($code = 200, ['success' => $permissions], 'permission_retrieved');
|
||||||
|
|
||||||
} elseif ($API_permissions->request_method === 'POST') {
|
} elseif ($API_permissions->request_method === 'POST') {
|
||||||
|
|
||||||
# Only superuser can create permission due to fact that the backend needs programming when setting a permission
|
# Only superuser can create permission due to fact that the backend needs programming when setting a permission
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ if ($API_apitoken->request_method === 'GET') {
|
|||||||
|
|
||||||
$API_apitoken->validateData($requiredFields);
|
$API_apitoken->validateData($requiredFields);
|
||||||
|
|
||||||
$API_apitoken->checkTokenPermissions($API_apitoken->data['user_uuid']);
|
$API_apitoken->checkTokenPermissions();
|
||||||
|
|
||||||
$apitokens = $API_apitoken->getTokens();
|
$apitokens = $API_apitoken->getTokens();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user