nextcloud/passman
1
1
Fork 0
mirror of https://github.com/nextcloud/passman.git synced 2025-10-27 05:46:32 +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:
brantje 2016-10-02 18:23:16 +02:00
commit 993fac55db
No known key found for this signature in database
GPG key ID: 5FF1D117F918687F
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
js/app/controllers/credential.js
View file

@ -77,10 +77,9 @@ angular.module('passmanApp')
$scope.acceptShareRequest = function(share_request){
console.log('Accepted share request', share_request);
var crypted_shared_key = share_request.shared_key;
var _vault = VaultService.getActiveVault();
var private_key = EncryptService.decryptString(VaultService.getActiveVault().private_sharing_key);
console.log(_vault);return;
//private_key = ShareService.rsaPrivateKeyFromPEM(private_key);
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);

2
lib/Db/SharingACLMapper.php
View file

@ -18,7 +18,7 @@ class SharingACLMapper extends Mapper {
const TABLE_NAME = '`*PREFIX*passman_sharing_acl`';
public function __construct(IDBConnection $db, Utils $utils) {
parent::__construct($db, 'passman_vaults');
parent::__construct($db, 'passman_sharing_acl');
$this->utils = $utils;
}

2
lib/Service/ShareService.php
View file

@ -77,7 +77,7 @@ class ShareService {
$acl->setExpire(0);
$acl->setPermissions($permissions);
$acl->setVaultId($request->getTargetVaultId());
$acl->getVaultGuid($request->getTargetVaultGuid());
$acl->setVaultGuid($request->getTargetVaultGuid());
$acl->setSharedKey($final_shared_key);
$this->sharingACL->createACLEntry($acl);