nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-11-10 22:22:38 +08:00
Code Issues Projects Releases Packages Wiki Activity

catch error for using the same source and destination account in the credential mover

Browse source
This commit is contained in:
binsky 2021-04-03 13:21:34 +02:00
parent 1e15710bdb
commit 11d774405b
3 changed files with 44 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
controller/admincontroller.php
View file

@ -79,38 +79,43 @@ class AdminController extends ApiController {
} }
public function moveCredentials($source_account, $destination_account) { public function moveCredentials($source_account, $destination_account) {
$vaults = $this->vaultService->getByUser($source_account); $succeed = false;
foreach ($vaults as $vault) { if ($source_account != $destination_account){
$credentials = $this->credentialService->getCredentialsByVaultId($vault->getId(), $source_account); $vaults = $this->vaultService->getByUser($source_account);
foreach ($credentials as $credential) { foreach ($vaults as $vault) {
$revisions = $this->revisionService->getRevisions($credential->getId()); $credentials = $this->credentialService->getCredentialsByVaultId($vault->getId(), $source_account);
foreach ($revisions as $revision) { foreach ($credentials as $credential) {
$r = new CredentialRevision(); $revisions = $this->revisionService->getRevisions($credential->getId());
$r->setId($revision['revision_id']); foreach ($revisions as $revision) {
$r->setGuid($revision['guid']); $r = new CredentialRevision();
$r->setCredentialId($credential->getId()); $r->setId($revision['revision_id']);
$r->setUserId($destination_account); $r->setGuid($revision['guid']);
$r->setCreated($revision['created']); $r->setCredentialId($credential->getId());
$r->setCredentialData(base64_encode(json_encode($revision['credential_data']))); $r->setUserId($destination_account);
$r->setEditedBy($revision['edited_by']); $r->setCreated($revision['created']);
$this->revisionService->updateRevision($r); $r->setCredentialData(base64_encode(json_encode($revision['credential_data'])));
$r->setEditedBy($revision['edited_by']);
$this->revisionService->updateRevision($r);
}
$c = $credential->jsonSerialize();
$c['user_id'] = $destination_account;
$c['icon'] = json_encode($c['icon']);
$this->credentialService->updateCredential($c, true);
} }
$vault->setUserId($destination_account);
$c = $credential->jsonSerialize(); $this->vaultService->updateVault($vault);
$c['user_id'] = $destination_account;
$c['icon'] = json_encode($c['icon']);
$this->credentialService->updateCredential($c, true);
} }
$vault->setUserId($destination_account);
$this->vaultService->updateVault($vault); $files = $this->fileService->getFilesFromUser($source_account);
foreach ($files as $file) {
$file->setUserId($destination_account);
$this->fileService->updateFile($file);
}
$succeed = true;
} }
$files = $this->fileService->getFilesFromUser($source_account); return new JSONResponse(array('success' => $succeed));
foreach ($files as $file) {
$file->setUserId($destination_account);
$this->fileService->updateFile($file);
}
return new JSONResponse(array('success' => true));
} }
public function listRequests(){ public function listRequests(){

13
js/settings-admin.js
View file

@ -174,12 +174,17 @@ $(document).ready(function () {
$(self).html('<i class="fa fa-spinner fa-spin"></i> ' + OC.L10N.translate('passman', 'Moving') + '...'); $(self).html('<i class="fa fa-spinner fa-spin"></i> ' + OC.L10N.translate('passman', 'Moving') + '...');
if (accountMover.source_account && accountMover.destination_account) { if (accountMover.source_account && accountMover.destination_account) {
$.post(OC.generateUrl('apps/passman/admin/move'), accountMover, function (data) { $.post(OC.generateUrl('apps/passman/admin/move'), accountMover, function (data) {
$(self).removeAttr('disabled');
$(self).html('Move');
if (data.success) { if (data.success) {
$(self).removeAttr('disabled'); $('#moveStatusSucceeded').fadeIn();
$(self).html('Move');
$('#moveStatus').fadeIn();
setTimeout(function () { setTimeout(function () {
$('#moveStatus').fadeOut(); $('#moveStatusSucceeded').fadeOut();
}, 3500);
} else {
$('#moveStatusFailed').fadeIn();
setTimeout(function () {
$('#moveStatusFailed').fadeOut();
}, 3500); }, 3500);
} }
}); });

3
templates/admin.php
View file

@ -131,7 +131,8 @@ style('passman', 'vendor/font-awesome/font-awesome.min');
</tr> </tr>
</table> </table>
<button class="success" id="move_credentials">Move</button> <button class="success" id="move_credentials">Move</button>
<span id="moveStatus" style="display: none;"><?php p($l->t('Credentials moved!')); ?></span> <span id="moveStatusSucceeded" style="display: none;"><?php p($l->t('Credentials moved!')); ?></span>
<span id="moveStatusFailed" style="display: none;"><?php p($l->t('An error occurred!')); ?></span>
</div> </div>
<div id="tabs-3"> <div id="tabs-3">