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

Add skip_revision param

Browse source
This commit is contained in:
brantje 2016-10-07 18:26:53 +02:00
parent ac086845b2
commit 59eafb2505
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
controller/credentialcontroller.php
View file

@ -107,7 +107,7 @@ class CredentialController extends ApiController {
$credential_id, $custom_fields, $delete_time, $credential_guid, $credential_id, $custom_fields, $delete_time, $credential_guid,
$description, $email, $expire_time, $favicon, $files, $guid, $description, $email, $expire_time, $favicon, $files, $guid,
$hidden, $label, $otp, $password, $renew_interval, $hidden, $label, $otp, $password, $renew_interval,
$tags, $url, $username, $vault_id, $revision_created, $shared_key, $acl, $unshare_action, $set_share_key) { $tags, $url, $username, $vault_id, $revision_created, $shared_key, $acl, $unshare_action, $set_share_key, $skip_revision) {
$storedCredential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId); $storedCredential = $this->credentialService->getCredentialByGUID($credential_guid, $this->userId);
@ -225,7 +225,9 @@ class CredentialController extends ApiController {
$storedCredential->setSharedKey(''); $storedCredential->setSharedKey('');
$credential['shared_key'] = ''; $credential['shared_key'] = '';
} }
$this->credentialRevisionService->createRevision($storedCredential, $storedCredential->getUserId(), $credential_id, $this->userId); if(!$skip_revision) {
$this->credentialRevisionService->createRevision($storedCredential, $storedCredential->getUserId(), $credential_id, $this->userId);
}
$credential = $this->credentialService->updateCredential($credential); $credential = $this->credentialService->updateCredential($credential);
return new JSONResponse($credential); return new JSONResponse($credential);

11
js/app/controllers/share.js
View file

@ -198,16 +198,14 @@ angular.module('passmanApp')
var new_key = VaultService.getActiveVault().vaultKey; var new_key = VaultService.getActiveVault().vaultKey;
_credential.shared_key = null; _credential.shared_key = null;
_credential.unshare_action = true; _credential.unshare_action = true;
_credential.skip_revision = true;
_credential = CredentialService.encryptCredential(_credential, old_key) _credential = CredentialService.encryptCredential(_credential, old_key);
CredentialService.updateCredential(_credential, true).then(function () { CredentialService.updateCredential(_credential, true).then(function () {
NotificationService.showNotification('Credential unshared', 4000) NotificationService.showNotification('Credential unshared', 4000);
CredentialService.reencryptCredential(_credential.guid, old_key, new_key).progress(function(data){ CredentialService.reencryptCredential(_credential.guid, old_key, new_key).progress(function(data){
console.log(data); console.log(data);
}).then(function(data){ }).then(function(data){
console.warn(data);
//@TODO Implement action on reencryption finished
console.error('This is still NOW called..')
getAcl(); getAcl();
}); });
}) })
@ -307,10 +305,11 @@ angular.module('passmanApp')
//This is here is not called //This is here is not called
var _credential = data.cryptogram; var _credential = data.cryptogram;
_credential.set_share_key = true; _credential.set_share_key = true;
_credential.skip_revision = true;
_credential.shared_key = EncryptService.encryptString(key); _credential.shared_key = EncryptService.encryptString(key);
console.log(_credential); console.log(_credential);
CredentialService.updateCredential(_credential, true).then(function () { CredentialService.updateCredential(_credential, true).then(function () {
NotificationService.showNotification('Credential shared', 4000) NotificationService.showNotification('Credential shared', 4000);
$scope.sharing_complete = true; $scope.sharing_complete = true;
}) })
}); });

1
js/app/services/credentialservice.js
View file

@ -181,6 +181,7 @@ angular.module('passmanApp')
this.call_progress(new progress_datatype(1, 2, 'credential')); this.call_progress(new progress_datatype(1, 2, 'credential'));
// Save data // Save data
this.parent.new_credential_cryptogram.skip_revision = true;
service.updateCredential(this.parent.new_credential_cryptogram, true).then((function(data){ service.updateCredential(this.parent.new_credential_cryptogram, true).then((function(data){
this.call_progress(new progress_datatype(2, 2, 'credential')); this.call_progress(new progress_datatype(2, 2, 'credential'));
this.call_then({ this.call_then({