diff --git a/js/app/controllers/revision.js b/js/app/controllers/revision.js index 452095fe..c5a54b17 100644 --- a/js/app/controllers/revision.js +++ b/js/app/controllers/revision.js @@ -36,7 +36,6 @@ angular.module('passmanApp') var getRevisions = function () { CredentialService.getRevisions($scope.storedCredential.credential_id).then(function (revisions) { - console.log(revisions) $scope.revisions = revisions; }) }; @@ -62,11 +61,11 @@ angular.module('passmanApp') if($scope.storedCredential.hasOwnProperty('acl')){ key = EncryptService.decryptString(angular.copy($scope.storedCredential.acl.shared_key)); } - console.log(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); + } else { + $scope.selectedRevision.credential_data = CredentialService.decryptCredential(angular.copy(revision.credential_data)); } $rootScope.$emit('app_menu', true); diff --git a/js/app/controllers/share.js b/js/app/controllers/share.js index 17d6e47b..c2d5de49 100644 --- a/js/app/controllers/share.js +++ b/js/app/controllers/share.js @@ -300,12 +300,12 @@ angular.module('passmanApp') } CredentialService.getRevisions($scope.storedCredential.credential_id).then(function (revisions) { - console.log(revisions); for (var r = 0; r < revisions.length; r++) { var _revision = revisions[r]; //Decrypt! _revision.credential_data = CredentialService.decryptCredential(_revision.credential_data); _revision.credential_data = ShareService.encryptSharedCredential(_revision.credential_data, key); + console.log('Used key for encrypting history ', key); CredentialService.updateRevision(_revision); } });