From d6c85bffcc68ae24e1422a47f990b923b8d9903e Mon Sep 17 00:00:00 2001
From: Marcos Zuriaga <wolfi@wolfi.es>
Date: Sun, 2 Oct 2016 20:18:51 +0200
Subject: [PATCH] Apply save shared item with the shared key Bugfixes

---
 js/app/controllers/share.js     | 1 +
 js/app/services/shareservice.js | 1 +
 lib/Db/Credential.php           | 3 +--
 lib/Db/CredentialMapper.php     | 4 ++--
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/js/app/controllers/share.js b/js/app/controllers/share.js
index 0e7eb633..2a2655c0 100644
--- a/js/app/controllers/share.js
+++ b/js/app/controllers/share.js
@@ -133,6 +133,7 @@ angular.module('passmanApp')
 				console.log(key);
 
 				var encryptedSharedCredential = ShareService.encryptSharedCredential($scope.storedCredential, key);
+				CredentialService.updateCredential(encryptedSharedCredential);
 
 				var list = $scope.share_settings.credentialSharedWithUserAndGroup;
 				console.log(list);
diff --git a/js/app/services/shareservice.js b/js/app/services/shareservice.js
index 74820fc7..b1c184c2 100644
--- a/js/app/services/shareservice.js
+++ b/js/app/services/shareservice.js
@@ -77,6 +77,7 @@ angular.module('passmanApp')
 			},
 			encryptSharedCredential: function(credential, sharedKey){
 				var _credential = angular.copy(credential);
+				_credential.shared_key = EncryptService.encryptString(sharedKey);
 				var encrypted_fields = CredentialService.getEncryptedFields();
 				for(var i = 0; i < encrypted_fields.length; i++){
 					var field = encrypted_fields[i];
diff --git a/lib/Db/Credential.php b/lib/Db/Credential.php
index 8dc87692..f28a75c1 100644
--- a/lib/Db/Credential.php
+++ b/lib/Db/Credential.php
@@ -55,7 +55,7 @@ use \OCP\AppFramework\Db\Entity;
  * @method string getOtp()
  * @method void setHidden(bool $value)
  * @method string getHidden()
- * @method void setSharedkey(string $value)
+ * @method void setSharedKey(string $value)
  * @method string getSharedKey()
 
 
@@ -98,7 +98,6 @@ class Credential extends Entity implements  \JsonSerializable{
 		$this->addType('deleteTime', 'integer');
 		$this->addType('vaultId', 'integer');
 		$this->addType('credentialId', 'integer');
-		$this->addType('isShared', 'integer');
 		$this->addType('hidden', 'integer');
 	}
 
diff --git a/lib/Db/CredentialMapper.php b/lib/Db/CredentialMapper.php
index a38a984d..e26d2205 100644
--- a/lib/Db/CredentialMapper.php
+++ b/lib/Db/CredentialMapper.php
@@ -85,7 +85,7 @@ class CredentialMapper extends Mapper {
 		$credential->setCustomFields($raw_credential['custom_fields']);
 		$credential->setOtp($raw_credential['otp']);
 		$credential->setHidden($raw_credential['hidden']);
-		$credential->setSharedkey($raw_credential['is_shared']);
+		$credential->setSharedKey($raw_credential['is_shared']);
 		return parent::insert($credential);
 	}
 
@@ -118,7 +118,7 @@ class CredentialMapper extends Mapper {
 		$credential->setOtp($raw_credential['otp']);
 		$credential->setHidden($raw_credential['hidden']);
 		$credential->setDeleteTime($raw_credential['delete_time']);
-		$credential->setSharedkey($raw_credential['is_shared']);
+		$credential->setSharedKey($raw_credential['shared_key']);
 		return parent::update($credential);
 	}