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

* [FIX] Fixed wrong behavior when searching for accounts on accounts manager. Thanks to @Weptun for the feedback. Closes #1271

Browse Source 
* [ADD] Added missing tests
* [MOD] Code cleanup

Signed-off-by: Rubén D <nuxsmin@syspass.org>
This commit is contained in:
Rubén D
2019-04-21 23:12:45 +02:00
parent b3906afa13
commit 2318796c00
366 changed files with 5141 additions and 3752 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/modules/web/Controllers/ConfigEncryptionController.php
View File

@@ -24,18 +24,24 @@
namespace SP\Modules\Web\Controllers;
use DI\DependencyException;
use DI\NotFoundException;
use Exception;
use SP\Core\Acl\Acl;
use SP\Core\Acl\UnauthorizedPageException;
use SP\Core\Crypt\Hash;
use SP\Core\Crypt\Session as CryptSession;
use SP\Core\Events\Event;
use SP\Core\Events\EventMessage;
use SP\Core\Exceptions\SPException;
use SP\Http\JsonResponse;
use SP\Modules\Web\Controllers\Traits\JsonTrait;
use SP\Repositories\NoSuchItemException;
use SP\Services\Config\ConfigService;
use SP\Services\Crypt\MasterPassService;
use SP\Services\Crypt\TemporaryMasterPassService;
use SP\Services\Crypt\UpdateMasterPassRequest;
use SP\Services\ServiceException;
use SP\Services\Task\TaskFactory;
/**
@@ -49,11 +55,11 @@ final class ConfigEncryptionController extends SimpleControllerBase
/**
* @return bool
* @throws \DI\DependencyException
* @throws \DI\NotFoundException
* @throws \SP\Repositories\NoSuchItemException
* @throws \SP\Services\ServiceException
* @throws \SP\Core\Exceptions\SPException
* @throws DependencyException
* @throws NotFoundException
* @throws NoSuchItemException
* @throws ServiceException
* @throws SPException
*/
public function saveAction()
{
@@ -144,7 +150,7 @@ final class ConfigEncryptionController extends SimpleControllerBase
$mastePassService->changeMasterPassword($request);
$this->eventDispatcher->notifyEvent('update.masterPassword.end', new Event($this));
} catch (\Exception $e) {
} catch (Exception $e) {
processException($e);
$this->eventDispatcher->notifyEvent('exception', new Event($e));
@@ -160,7 +166,7 @@ final class ConfigEncryptionController extends SimpleControllerBase
$this->eventDispatcher->notifyEvent('update.masterPassword.hash', new Event($this));
$mastePassService->updateConfig(Hash::hashKey($newMasterPass));
} catch (\Exception $e) {
} catch (Exception $e) {
processException($e);
$this->eventDispatcher->notifyEvent('exception', new Event($e));
@@ -195,7 +201,7 @@ final class ConfigEncryptionController extends SimpleControllerBase
new Event($this, EventMessage::factory()->addDescription(__u('Master password hash updated'))));
return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Master password hash updated'));
} catch (\Exception $e) {
} catch (Exception $e) {
processException($e);
$this->eventDispatcher->notifyEvent('exception', new Event($e));
@@ -233,7 +239,7 @@ final class ConfigEncryptionController extends SimpleControllerBase
__u('Temporary password generated'),
[__u('Email sent')]
);
} catch (\Exception $e) {
} catch (Exception $e) {
processException($e);
$this->eventDispatcher->notifyEvent('exception', new Event($e));
@@ -247,7 +253,7 @@ final class ConfigEncryptionController extends SimpleControllerBase
}
return $this->returnJsonResponse(JsonResponse::JSON_SUCCESS, __u('Temporary password generated'));
} catch (\Exception $e) {
} catch (Exception $e) {
processException($e);
$this->eventDispatcher->notifyEvent('exception', new Event($e));