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

Some fixes

Browse source
This commit is contained in:
brantje 2016-10-06 18:00:57 +02:00
parent 67e8cb8138
commit 342385232c
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -290,7 +290,7 @@ angular.module('passmanApp')
} else { } else {
ShareService.generateSharedKey(20).then(function (key) { ShareService.generateSharedKey(20).then(function (key) {
var encryptedSharedCredential = ShareService.encryptSharedCredential($scope.storedCredential, key);
// encryptedSharedCredential.set_share_key = true; // encryptedSharedCredential.set_share_key = true;
// CredentialService.updateCredential(encryptedSharedCredential, true).then(function (sharedCredential) { // CredentialService.updateCredential(encryptedSharedCredential, true).then(function (sharedCredential) {
// $scope.storedCredential = ShareService.decryptSharedCredential(sharedCredential, key); // $scope.storedCredential = ShareService.decryptSharedCredential(sharedCredential, key);
@ -322,8 +322,13 @@ angular.module('passmanApp')
// CredentialService.updateRevision(_revision); // CredentialService.updateRevision(_revision);
// } // }
// }); // });
var old_key = VaultService.getActiveVault().vaultKey console.log($scope.storedCredential)
var encryptedSharedCredential = angular.copy($scope.storedCredential);
var old_key = VaultService.getActiveVault().vaultKey;
console.log(encryptedSharedCredential); console.log(encryptedSharedCredential);
encryptedSharedCredential.set_share_key = true;
encryptedSharedCredential.shared_key = EncryptService.encryptString(key);
CredentialService.reencryptCredential(encryptedSharedCredential.credential_id, old_key, key).progress(function(data){ CredentialService.reencryptCredential(encryptedSharedCredential.credential_id, old_key, key).progress(function(data){
console.log(data); console.log(data);
}).then(function(data){ }).then(function(data){

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

@ -8,7 +8,7 @@
* Service in the passmanApp. * Service in the passmanApp.
*/ */
angular.module('passmanApp') angular.module('passmanApp')
.service('CredentialService', ['$http', 'EncryptService', 'VaultService', 'FileService', 'CredentialService', function ($http, EncryptService, VaultService, FileService, CredentialService) { .service('CredentialService', ['$http', 'EncryptService', 'VaultService', 'FileService', function ($http, EncryptService, VaultService, FileService) {
var credential = { var credential = {
'credential_id': null, 'credential_id': null,
'guid': null, 'guid': null,
@ -215,7 +215,7 @@ angular.module('passmanApp')
}; };
var promise_revisions_update = function(){ var promise_revisions_update = function(){
CredentialService.getRevisions(this.parent.plain_credential.guid).then((function (revisions) { service.getRevisions(this.parent.plain_credential.guid).then((function (revisions) {
// Double, so we include the actual upload of the data back to the server // Double, so we include the actual upload of the data back to the server
this.total = revisions.length * 2; this.total = revisions.length * 2;
this.upload = 0; this.upload = 0;