From 612dcd355bc46ae8f5500a89ba08a993d7556478 Mon Sep 17 00:00:00 2001
From: brantje <brantje@gmail.com>
Date: Wed, 18 Jan 2017 18:38:28 +0100
Subject: [PATCH] Fix missing admin-settings.js

Remove settings property (Fixes #211)

Add file to avoid errors (Fixes #210)

Fix for deleting credential

Fix for deleting vault (fixes #212)
---
 Gruntfile.js                        | 3 ++-
 appinfo/info.xml                    | 4 ----
 controller/credentialcontroller.php | 5 +++--
 controller/vaultcontroller.php      | 4 ++--
 personal.php                        | 1 +
 5 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 personal.php

diff --git a/Gruntfile.js b/Gruntfile.js
index d61256cc..9c03ad64 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -257,7 +257,8 @@ module.exports = function (grunt) {
 						'js/exporters/exporter-main.js',
 						'js/exporters/*.js',
 						'js/app/controllers/*.js',
-						'js/templates.js'
+						'js/templates.js',
+						'js/settings-admin.js'
 					]
 				}
 			}
diff --git a/appinfo/info.xml b/appinfo/info.xml
index 45f03643..36a1ba52 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -48,10 +48,6 @@ For an demo of this app visit [https://demo.passman.cc](https://demo.passman.cc)
         </post-migration>
     </repair-steps>
 
-    <settings>
-        <admin>OCA\Passman\Controller\SettingsController</admin>
-    </settings>
-
     <background-jobs>
         <job>OCA\Passman\BackgroundJob\ExpireCredentials</job>
     </background-jobs>
diff --git a/controller/credentialcontroller.php b/controller/credentialcontroller.php
index 554755e7..5da657c5 100644
--- a/controller/credentialcontroller.php
+++ b/controller/credentialcontroller.php
@@ -266,8 +266,9 @@ class CredentialController extends ApiController {
 		} catch (\Exception $e) {
 			return new NotFoundJSONResponse();
 		}
-		if ($credential) {
+		if ($credential instanceof Credential) {
 			$result = $this->credentialService->deleteCredential($credential);
+			//print_r($credential);
 			$this->deleteCredentialParts($credential);
 		} else {
 			$result = false;
@@ -286,7 +287,7 @@ class CredentialController extends ApiController {
 			'', $this->userId, Activity::TYPE_ITEM_ACTION);
 		$this->sharingService->unshareCredential($credential->getGuid());
 		foreach ($this->credentialRevisionService->getRevisions($credential->getId()) as $revision) {
-			$this->credentialRevisionService->deleteRevision($revision->getId(), $this->userId);
+				$this->credentialRevisionService->deleteRevision($revision['id'], $this->userId);
 		}
 	}
 
diff --git a/controller/vaultcontroller.php b/controller/vaultcontroller.php
index 8381dd63..4bd2140e 100644
--- a/controller/vaultcontroller.php
+++ b/controller/vaultcontroller.php
@@ -158,8 +158,8 @@ class VaultController extends ApiController {
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function delete($vault_id) {
-		$this->vaultService->deleteVault($vault_id, $this->userId);
+	public function delete($vault_guid) {
+		$this->vaultService->deleteVault($vault_guid, $this->userId);
 		return new JSONResponse(array('ok' => true));
 	}
 }
\ No newline at end of file
diff --git a/personal.php b/personal.php
new file mode 100644
index 00000000..c9ce2ae9
--- /dev/null
+++ b/personal.php
@@ -0,0 +1 @@
+<!-- Placeholder file -->
\ No newline at end of file