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

Merge branch 'sharing_no_groups' of github.com:nextcloud/passman into sharing_no_groups

Browse source
This commit is contained in:
Marcos Zuriaga 2016-10-05 18:48:14 +02:00
commit 4051602a13
No known key found for this signature in database
GPG key ID: 7D15585354D072FF
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
js/app/controllers/revision.js
View file

@ -36,7 +36,6 @@ angular.module('passmanApp')
var getRevisions = function () { var getRevisions = function () {
CredentialService.getRevisions($scope.storedCredential.credential_id).then(function (revisions) { CredentialService.getRevisions($scope.storedCredential.credential_id).then(function (revisions) {
console.log(revisions)
$scope.revisions = revisions; $scope.revisions = revisions;
}) })
}; };
@ -62,11 +61,11 @@ angular.module('passmanApp')
if($scope.storedCredential.hasOwnProperty('acl')){ if($scope.storedCredential.hasOwnProperty('acl')){
key = EncryptService.decryptString(angular.copy($scope.storedCredential.acl.shared_key)); key = EncryptService.decryptString(angular.copy($scope.storedCredential.acl.shared_key));
} }
console.log(key);
if(key){ if(key){
$scope.selectedRevision.credential_data = CredentialService.decryptCredential(angular.copy(revision.credential_data));
} else {
$scope.selectedRevision.credential_data = ShareService.decryptSharedCredential(angular.copy(revision.credential_data), key); $scope.selectedRevision.credential_data = ShareService.decryptSharedCredential(angular.copy(revision.credential_data), key);
} else {
$scope.selectedRevision.credential_data = CredentialService.decryptCredential(angular.copy(revision.credential_data));
} }
$rootScope.$emit('app_menu', true); $rootScope.$emit('app_menu', true);

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

@ -300,12 +300,12 @@ angular.module('passmanApp')
} }
CredentialService.getRevisions($scope.storedCredential.credential_id).then(function (revisions) { CredentialService.getRevisions($scope.storedCredential.credential_id).then(function (revisions) {
console.log(revisions);
for (var r = 0; r < revisions.length; r++) { for (var r = 0; r < revisions.length; r++) {
var _revision = revisions[r]; var _revision = revisions[r];
//Decrypt! //Decrypt!
_revision.credential_data = CredentialService.decryptCredential(_revision.credential_data); _revision.credential_data = CredentialService.decryptCredential(_revision.credential_data);
_revision.credential_data = ShareService.encryptSharedCredential(_revision.credential_data, key); _revision.credential_data = ShareService.encryptSharedCredential(_revision.credential_data, key);
console.log('Used key for encrypting history ', key);
CredentialService.updateRevision(_revision); CredentialService.updateRevision(_revision);
} }
}); });