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

* [MOD] Improved exception handling.

Browse Source
This commit is contained in:
nuxsmin
2018-02-24 12:48:15 +01:00
parent 123505b321
commit ae40fb6d1b
12 changed files with 165 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/modules/web/Controllers/UserGroupController.php
View File

@@ -27,7 +27,6 @@ namespace SP\Modules\Web\Controllers;
use SP\Core\Acl\Acl;
use SP\Core\Acl\ActionsInterface;
use SP\Core\Events\Event;
use SP\Core\Exceptions\SPException;
use SP\Core\Exceptions\ValidationException;
use SP\DataModel\UserGroupData;
use SP\Forms\UserGroupForm;
@@ -104,13 +103,13 @@ class UserGroupController extends ControllerBase implements CrudControllerInterf
$this->setViewData();
$this->eventDispatcher->notifyEvent('show.userGroup.create', new Event($this));
$this->returnJsonResponseData(['html' => $this->render()]);
} catch (\Exception $e) {
processException($e);
$this->returnJsonResponse(1, $e->getMessage());
$this->returnJsonResponseException($e);
}
$this->returnJsonResponseData(['html' => $this->render()]);
}
/**
@@ -163,19 +162,21 @@ class UserGroupController extends ControllerBase implements CrudControllerInterf
$this->setViewData($id);
$this->eventDispatcher->notifyEvent('show.userGroup.edit', new Event($this));
$this->returnJsonResponseData(['html' => $this->render()]);
} catch (\Exception $e) {
processException($e);
$this->returnJsonResponse(JsonResponse::JSON_ERROR, $e->getMessage());
$this->returnJsonResponseException($e);
}
$this->returnJsonResponseData(['html' => $this->render()]);
}
/**
* Delete action
*
* @param $id
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
*/
public function deleteAction($id)
{
@@ -192,10 +193,10 @@ class UserGroupController extends ControllerBase implements CrudControllerInterf
$this->eventDispatcher->notifyEvent('delete.userGroup', new Event($this));
$this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Grupo eliminado'));
} catch (SPException $e) {
} catch (\Exception $e) {
processException($e);
$this->returnJsonResponse(JsonResponse::JSON_ERROR, $e->getMessage());
$this->returnJsonResponseException($e);
}
}
@@ -224,11 +225,11 @@ class UserGroupController extends ControllerBase implements CrudControllerInterf
$this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Grupo creado'));
} catch (ValidationException $e) {
$this->returnJsonResponse(JsonResponse::JSON_ERROR, $e->getMessage());
$this->returnJsonResponseException($e);
} catch (\Exception $e) {
processException($e);
$this->returnJsonResponse(JsonResponse::JSON_ERROR, $e->getMessage());
$this->returnJsonResponseException($e);
}
}
@@ -236,6 +237,8 @@ class UserGroupController extends ControllerBase implements CrudControllerInterf
* Saves edit action
*
* @param $id
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
*/
public function saveEditAction($id)
{
@@ -259,11 +262,11 @@ class UserGroupController extends ControllerBase implements CrudControllerInterf
$this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Grupo actualizado'));
} catch (ValidationException $e) {
$this->returnJsonResponse(JsonResponse::JSON_ERROR, $e->getMessage());
$this->returnJsonResponseException($e);
} catch (\Exception $e) {
processException($e);
$this->returnJsonResponse(JsonResponse::JSON_ERROR, $e->getMessage());
$this->returnJsonResponseException($e);
}
}
@@ -286,13 +289,13 @@ class UserGroupController extends ControllerBase implements CrudControllerInterf
$this->setViewData($id);
$this->eventDispatcher->notifyEvent('show.userGroup', new Event($this));
$this->returnJsonResponseData(['html' => $this->render()]);
} catch (\Exception $e) {
processException($e);
$this->returnJsonResponse(JsonResponse::JSON_ERROR, $e->getMessage());
$this->returnJsonResponseException($e);
}
$this->returnJsonResponseData(['html' => $this->render()]);
}
/**
@@ -300,6 +303,7 @@ class UserGroupController extends ControllerBase implements CrudControllerInterf
*
* @throws \Psr\Container\ContainerExceptionInterface
* @throws \Psr\Container\NotFoundExceptionInterface
* @throws \SP\Services\Auth\AuthException
*/
protected function initialize()
{