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

This commit is contained in:
brantje 2016-10-02 17:19:16 +02:00
commit 5024c1f313
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F

View file

@ -74,7 +74,14 @@ angular.module('passmanApp')
$scope.acceptShareRequest = function(share_request){
console.log('Accepted share request', share_request);
var crypted_shared_key = '';
var crypted_shared_key = share_request.shared_key;
var private_key = VaultService.getActiveVault();
console.log(private_key);return;
private_key = ShareService.rsaPrivateKeyFromPEM(private_key);
crypted_shared_key = private_key.decrypt(forge.util.decode64(crypted_shared_key));
crypted_shared_key = EncryptService.encryptString(crypted_shared_key);
ShareService.saveSharingRequest(share_request, crypted_shared_key).then(function (result) {
console.log(result)
})