refactor exceptions

1 files changed, 14 insertions, 31 deletions

diff --git a/lib/Controller/ShareController.php b/lib/Controller/ShareController.php
index c1a54006..05089b05 100644
--- a/lib/Controller/ShareController.php
+++ b/lib/Controller/ShareController.php
@@ -23,13 +23,9 @@
 
 namespace OCA\Polls\Controller;
 
-use Exception;
 use OCP\AppFramework\Db\DoesNotExistException;
-use OCA\Polls\Exceptions\NotAuthorizedException;
-use OCA\Polls\Exceptions\InvalidUsernameException;
-use OCA\Polls\Exceptions\InvalidShareType;
-use OCA\Polls\Exceptions\ShareAlreadyExists;
-use OCA\Polls\Exceptions\CirclesNotEnabled;
+use OCA\Polls\Exceptions\Exception;
+use OCA\Polls\Exceptions\ShareAlreadyExistsException;
 
 
 use OCP\IRequest;
@@ -85,10 +81,8 @@ class ShareController extends Controller {
 	public function list($pollId) {
 		try {
 			return new DataResponse(['shares' => $this->shareService->list($pollId)], Http::STATUS_OK);
-		} catch (NotAuthorizedException $e) {
+		} catch (Exception $e) {
 			return new DataResponse($e->getMessage(), $e->getStatus());
-		} catch (\Exception $e) {
-			return new DataResponse($e->getMessage(), Http::STATUS_CONFLICT);
 		}
 	}
 
@@ -103,9 +97,7 @@ class ShareController extends Controller {
 	public function add($pollId, $type, $userId = '') {
 		try {
 			return new DataResponse(['share' => $this->shareService->add($pollId, $type, $userId)], Http::STATUS_CREATED);
-		} catch (NotAuthorizedException $e) {
-			return new DataResponse($e->getMessage(), $e->getStatus());
-		} catch (ShareAlreadyExists $e) {
+		} catch (Exception $e) {
 			return new DataResponse($e->getMessage(), $e->getStatus());
 		}
 	}
@@ -119,10 +111,8 @@ class ShareController extends Controller {
 	public function get($token) {
 		try {
 			return new DataResponse(['share' => $this->shareService->get($token)], Http::STATUS_CREATED);
-		} catch (NotAuthorizedException $e) {
+		} catch (Exception $e) {
 			return new DataResponse($e->getMessage(), $e->getStatus());
-		} catch (\Exception $e) {
-			return new DataResponse($e->getMessage(), Http::STATUS_CONFLICT);
 		}
 	}
 
@@ -140,12 +130,8 @@ class ShareController extends Controller {
 	public function setEmailAddress($token, $emailAddress) {
 		try {
 			return new DataResponse(['share' => $this->shareService->setEmailAddress($token, $emailAddress)], Http::STATUS_OK);
-		} catch (NotAuthorizedException $e) {
-			return new DataResponse($e->getMessage(), $e->getStatus());
-		} catch (InvalidShareType $e) {
+		} catch (Exception $e) {
 			return new DataResponse($e->getMessage(), $e->getStatus());
-		} catch (\Exception $e) {
-			return new DataResponse($e->getMessage(), Http::STATUS_CONFLICT);
 		}
 	}
 
@@ -161,13 +147,10 @@ class ShareController extends Controller {
 	public function personal($token, $userName, $emailAddress = '') {
 		try {
 			return new DataResponse($this->shareService->personal($token, $userName, $emailAddress), Http::STATUS_CREATED);
-		} catch (NotAuthorizedException $e) {
-			return new DataResponse($e->getMessage(), $e->getStatus());
-		} catch (InvalidUsernameException $e) {
-			return new DataResponse(['error' => $userName . ' is not valid'], Http::STATUS_CONFLICT);
 		} catch (DoesNotExistException $e) {
-			// return forbidden in all not catched error cases
 			return new DataResponse($e->getMessage(), Http::STATUS_FORBIDDEN);
+		} catch (Exception $e) {
+			return new DataResponse($e->getMessage(), $e->getStatus());
 		}
 	}
 
@@ -181,10 +164,10 @@ class ShareController extends Controller {
 	public function delete($token) {
 		try {
 			return new DataResponse($this->shareService->delete($token), Http::STATUS_OK);
-		} catch (NotAuthorizedException $e) {
-			return new DataResponse($e->getMessage(), $e->getStatus());
+		} catch (DoesNotExistException $e) {
+			return new DataResponse($e->getMessage(), Http::STATUS_OK);
 		} catch (Exception $e) {
-			return new DataResponse($e->getMessage(), Http::STATUS_NOT_FOUND);
+			return new DataResponse($e->getMessage(), $e->getStatus());
 		}
 	}
 
@@ -220,7 +203,7 @@ class ShareController extends Controller {
 					try {
 						$newShare = $this->shareService->add($share->getPollId(), $member->getType(), $member->getId());
 						$shares[] = $newShare;
-					} catch (ShareAlreadyExists $e) {
+					} catch (ShareAlreadyExistsException $e) {
 						continue;
 					}
 				}
@@ -229,7 +212,7 @@ class ShareController extends Controller {
 					try {
 						$newShare = $this->shareService->add($share->getPollId(), Share::TYPE_CONTACT, $contact->getId());
 						$shares[] = $newShare;
-					} catch (ShareAlreadyExists $e) {
+					} catch (ShareAlreadyExistsException $e) {
 						continue;
 					}
 				}
@@ -237,7 +220,7 @@ class ShareController extends Controller {
 			$this->shareService->delete($token);
 			return new DataResponse(['shares' => $shares], Http::STATUS_OK);
 		} catch (Exception $e) {
-			return new DataResponse($e->getMessage(), Http::STATUS_CONFLICT);
+			return new DataResponse($e->getMessage(), $e->getStatus());
 		}
 	}
 }