');
}]);
angular.module('views/vaults.html', []).run(['$templateCache', function($templateCache) {
diff --git a/lib/Db/Vault.php b/lib/Db/Vault.php
index 4a43ff11..c840cdea 100644
--- a/lib/Db/Vault.php
+++ b/lib/Db/Vault.php
@@ -31,6 +31,8 @@ use \OCP\AppFramework\Db\Entity;
* @method string getPrivateSharingKey()
* @method void setSharingKeysGenerated(integer $value)
* @method integer getSharingKeysGenerated()
+ * @method void setVaultSettings(integer $value)
+ * @method integer getVaultSettings()
*/
@@ -46,11 +48,13 @@ class Vault extends Entity implements \JsonSerializable{
protected $publicSharingKey;
protected $privateSharingKey;
protected $sharingKeysGenerated;
+ protected $vaultSettings;
+
public function __construct() {
// add types in constructor
$this->addType('created', 'integer');
$this->addType('lastAccess', 'integer');
- $this->addType('sharing_keys_generated', 'integer');
+ $this->addType('sharingKeysGenerated', 'integer');
}
/**
* Turns entity attributes into an array
@@ -61,9 +65,7 @@ class Vault extends Entity implements \JsonSerializable{
'guid' => $this->getGuid(),
'name' => $this->getName(),
'created' => $this->getCreated(),
- 'private_sharing_key' => $this->getPrivateSharingKey(),
'public_sharing_key' => $this->getPublicSharingKey(),
- 'sharing_keys_generated' => $this->getSharingKeysGenerated(),
'last_access' => $this->getlastAccess(),
];
}
diff --git a/lib/Db/VaultMapper.php b/lib/Db/VaultMapper.php
index 0eadd459..b804a054 100644
--- a/lib/Db/VaultMapper.php
+++ b/lib/Db/VaultMapper.php
@@ -26,12 +26,13 @@ class VaultMapper extends Mapper {
* @throws \OCP\AppFramework\Db\DoesNotExistException if not found
* @throws \OCP\AppFramework\Db\MultipleObjectsReturnedException if more than one result
*/
- public function find($vault_id) {
+ public function find($vault_id, $user_id) {
$sql = 'SELECT * FROM `*PREFIX*passman_vaults` ' .
- 'WHERE `user_id` = ?';
- return $this->findEntities($sql, [$vault_id]);
+ 'WHERE `id`= ? and `user_id` = ?';
+ return $this->findEntities($sql, [$vault_id, $user_id]);
}
+
public function findVaultsFromUser($userId){
$sql = 'SELECT * FROM `*PREFIX*passman_vaults` ' .
'WHERE `user_id` = ? ';
@@ -45,14 +46,19 @@ class VaultMapper extends Mapper {
$vault->setUserId($userId);
$vault->setGuid($this->utils->GUID());
$vault->setCreated($this->utils->getTime());
- $vault->setlastAccess(0);
+ $vault->setLastAccess(0);
return parent::insert($vault);
}
- public function setLastAccess($vault_id){
+ public function setLastAccess($vault_id, $user_id){
$vault = new Vault();
$vault->setId($vault_id);
- $vault->setlastAccess(time());
+ $vault->setUserId($user_id);
+ $vault->setLastAccess(time());
+ $this->update($vault);
+ }
+
+ public function updateVault(Vault $vault){
$this->update($vault);
}
diff --git a/lib/Service/VaultService.php b/lib/Service/VaultService.php
index 26916b05..a8b365c4 100644
--- a/lib/Service/VaultService.php
+++ b/lib/Service/VaultService.php
@@ -29,12 +29,21 @@ class VaultService {
return $this->vaultMapper->findVaultsFromUser($userId);
}
+ public function getById($vault_id, $user_id) {
+ $vault = $this->vaultMapper->find($vault_id, $user_id);
+ return $vault;
+ }
+
public function createVault($vault_name, $userId) {
return $this->vaultMapper->create($vault_name, $userId);
}
- public function setLastAccess($vault_id){
- return $this->vaultMapper->setLastAccess($vault_id);
+ public function updateVault($vault) {
+ return $this->vaultMapper->updateVault($vault);
+ }
+
+ public function setLastAccess($vault_id, $user_id){
+ return $this->vaultMapper->setLastAccess($vault_id, $user_id);
}
public function updateSharingKeys($vault_id, $privateKey, $publicKey){
diff --git a/templates/views/partials/forms/settings/password_settings.html b/templates/views/partials/forms/settings/password_settings.html
new file mode 100644
index 00000000..8666fb35
--- /dev/null
+++ b/templates/views/partials/forms/settings/password_settings.html
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/templates/views/show_vault.html b/templates/views/show_vault.html
index 0fad02df..e90e52bc 100644
--- a/templates/views/show_vault.html
+++ b/templates/views/show_vault.html
@@ -61,7 +61,7 @@