Fixes for errors found by tests

2 files changed, 41 insertions, 33 deletions

diff --git a/controller/internalcontroller.php b/controller/internalcontroller.php
index 74a98ada..5bbad891 100644
--- a/controller/internalcontroller.php
+++ b/controller/internalcontroller.php
@@ -40,15 +40,17 @@ class InternalController extends ApiController {
 	 */
 	public function remind($credential_id) {
 		$credential = $this->credentialService->getCredentialById($credential_id, $this->userId);
-		$credential->setExpireTime(time() + (24 * 60 * 60));
-		$this->credentialService->upd($credential);
+		if($credential) {
+			$credential->setExpireTime(time() + (24 * 60 * 60));
+			$this->credentialService->upd($credential);
 
-		$manager = \OC::$server->getNotificationManager();
-		$notification = $manager->createNotification();
-		$notification->setApp('passman')
-			->setObject('credential', $credential_id)
-			->setUser($this->userId);
-		$manager->markProcessed($notification);
+			$manager = \OC::$server->getNotificationManager();
+			$notification = $manager->createNotification();
+			$notification->setApp('passman')
+				->setObject('credential', $credential_id)
+				->setUser($this->userId);
+			$manager->markProcessed($notification);
+		}
 	}
 
 	/**
@@ -57,15 +59,17 @@ class InternalController extends ApiController {
 	public function read($credential_id) {
 
 		$credential = $this->credentialService->getCredentialById($credential_id, $this->userId);
-		$credential->setExpireTime(0);
-		$this->credentialService->upd($credential);
+		if($credential) {
+			$credential->setExpireTime(0);
+			$this->credentialService->upd($credential);
 
-		$manager = \OC::$server->getNotificationManager();
-		$notification = $manager->createNotification();
-		$notification->setApp('passman')
-			->setObject('credential', $credential_id)
-			->setUser($this->userId);
-		$manager->markProcessed($notification);
+			$manager = \OC::$server->getNotificationManager();
+			$notification = $manager->createNotification();
+			$notification->setApp('passman')
+				->setObject('credential', $credential_id)
+				->setUser($this->userId);
+			$manager->markProcessed($notification);
+		}
 	}
 
 	/**
diff --git a/controller/vaultcontroller.php b/controller/vaultcontroller.php
index 4891aa6c..93df13b2 100644
--- a/controller/vaultcontroller.php
+++ b/controller/vaultcontroller.php
@@ -50,19 +50,20 @@ class VaultController extends ApiController {
 		$vaults = $this->vaultService->getByUser($this->userId);
 
 		$protected_credential_fields = array('getDescription', 'getEmail', 'getUsername', 'getPassword');
-
-		foreach ($vaults as $vault) {
-			$credential = $this->credentialService->getRandomCredentialByVaultId($vault->getId(), $this->userId);
-			$secret_field = $protected_credential_fields[array_rand($protected_credential_fields)];
-			array_push($result, array(
-				'vault_id' => $vault->getId(),
-				'guid' => $vault->getGuid(),
-				'name' => $vault->getName(),
-				'created' => $vault->getCreated(),
-				'public_sharing_key' => $vault->getPublicSharingKey(),
-				'last_access' => $vault->getlastAccess(),
-				'challenge_password' => $credential->{$secret_field}()
-			));
+		if ($vaults) {
+			foreach ($vaults as $vault) {
+				$credential = $this->credentialService->getRandomCredentialByVaultId($vault->getId(), $this->userId);
+				$secret_field = $protected_credential_fields[array_rand($protected_credential_fields)];
+				array_push($result, array(
+					'vault_id' => $vault->getId(),
+					'guid' => $vault->getGuid(),
+					'name' => $vault->getName(),
+					'created' => $vault->getCreated(),
+					'public_sharing_key' => $vault->getPublicSharingKey(),
+					'last_access' => $vault->getlastAccess(),
+					'challenge_password' => $credential->{$secret_field}()
+				));
+			}
 		}
 
 		return new JSONResponse($result);
@@ -87,7 +88,7 @@ class VaultController extends ApiController {
 		try {
 			$vault = $this->vaultService->getByGuid($vault_guid, $this->userId);
 		} catch (\Exception $e) {
-            return new NotFoundJSONResponse();
+			return new NotFoundJSONResponse();
 		}
 		$result = array();
 		if ($vault) {
@@ -119,10 +120,10 @@ class VaultController extends ApiController {
 	 */
 	public function update($vault_guid, $name, $vault_settings) {
 		$vault = $this->vaultService->getByGuid($vault_guid, $this->userId);
-		if ($name) {
+		if ($name && $vault) {
 			$vault->setName($name);
 		}
-		if ($vault_settings) {
+		if ($vault_settings && $vault) {
 			$vault->setVaultSettings($vault_settings);
 		}
 		$this->vaultService->updateVault($vault);
@@ -137,10 +138,13 @@ class VaultController extends ApiController {
 		try {
 			$vault = $this->vaultService->getByGuid($vault_guid, $this->userId);
 		} catch (\Exception $e) {
+			// No need to catch the execption
+		}
 
+		if ($vault) {
+			$this->vaultService->updateSharingKeys($vault->getId(), $private_sharing_key, $public_sharing_key);
 		}
 
-		$this->vaultService->updateSharingKeys($vault->getId(), $private_sharing_key, $public_sharing_key);
 		return;
 	}