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

* [MOD] Improved task management

Browse Source 
* [MOD] Code refactoring. Work in progress
* [FIX] Bugfixes. Work in progress
This commit is contained in:
nuxsmin
2018-03-07 00:01:15 +01:00
parent e33ca35aa2
commit 1cb22bdda3
20 changed files with 538 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,6 +68,7 @@ class ConfigEncryptionController extends SimpleControllerBase
$newMasterPassR = Request::analyzeEncrypted('newMasterPwdR');
$confirmPassChange = Request::analyzeBool('confirmPassChange', false);
$noAccountPassChange = Request::analyzeBool('chkNoAccountChange', false);
$taskId = Request::analyzeString('taskId');
if (!$mastePassService->checkUserUpdateMPass($this->session->getUserData()->getLastUpdateMPass())) {
$this->returnJsonResponse(JsonResponse::JSON_SUCCESS_STICKY, __u('Clave maestra actualizada'), [__u('Reinicie la sesión para cambiarla')]);
@@ -102,11 +103,13 @@ class ConfigEncryptionController extends SimpleControllerBase
if (!$noAccountPassChange) {
Util::lockApp($this->session->getUserData()->getId(), 'masterpass');
$task = $taskId !== null ? TaskFactory::create(__FUNCTION__, $taskId) : null;
$request = new UpdateMasterPassRequest(
$currentMasterPass,
$newMasterPass,
$configService->getByParam('masterPwd'),
TaskFactory::create(__FUNCTION__, 'masterpass')
$task
);
try {
@@ -126,7 +129,9 @@ class ConfigEncryptionController extends SimpleControllerBase
} finally {
Util::unlockApp();
TaskFactory::end($request->getTask()->getTaskId());
if ($task) {
TaskFactory::end($task->getTaskId());
}
}
} else {
try {