1 files changed, 21 insertions, 23 deletions

diff --git a/lib/Controller/ShareApiController.php b/lib/Controller/ShareApiController.php
index 3d7912da..261262b8 100644
--- a/lib/Controller/ShareApiController.php
+++ b/lib/Controller/ShareApiController.php
@@ -28,7 +28,6 @@ use OCP\AppFramework\Db\DoesNotExistException;
 use OCA\Polls\Exceptions\NotAuthorizedException;
 use OCA\Polls\Exceptions\InvalidUsername;
 
-
 use OCP\IRequest;
 use OCP\AppFramework\ApiController;
 use OCP\AppFramework\Http;
@@ -39,13 +38,15 @@ use OCA\Polls\Service\MailService;
 
 class ShareApiController extends ApiController {
 
+	/** @var ShareService */
 	private $shareService;
+
+	/** @var MailService */
 	private $mailService;
 
 	/**
-	 * ShareController constructor.
+	 * ShareApiController constructor
 	 * @param string $appName
-	 * @param string $userId
 	 * @param IRequest $request
 	 * @param MailService $mailService
 	 * @param ShareService $shareService
@@ -66,12 +67,11 @@ class ShareApiController extends ApiController {
 	}
 
 	/**
-	 * list
 	 * Read all shares of a poll based on the poll id and return list as array
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
-	 * @param integer $pollId
+	 * @param int $pollId
 	 * @return DataResponse
 	 */
 	public function list($pollId) {
@@ -85,11 +85,10 @@ class ShareApiController extends ApiController {
 	}
 
 	/**
-	* get share by token
-	* Get pollId by token
+	* Get share by token
 	* @NoAdminRequired
-	* @NoCSRFRequired
 	* @CORS
+	* @NoCSRFRequired
 	* @param string $token
 	* @return DataResponse
 	*/
@@ -104,7 +103,7 @@ class ShareApiController extends ApiController {
 	}
 
 	/**
-	 * Write a new share to the db and returns the new share as array
+	 * Add share
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
@@ -117,47 +116,46 @@ class ShareApiController extends ApiController {
 	public function add($pollId, $type, $userId = '', $userEmail = '') {
 		try {
 			return new DataResponse(['share' => $this->shareService->add($pollId, $type, $userId, $userEmail)], Http::STATUS_CREATED);
-		} catch (\Exception $e) {
-			return new DataResponse(['error' => $e], Http::STATUS_CONFLICT);
 		} catch (NotAuthorizedException $e) {
 			return new DataResponse(['error' => $e->getMessage()], $e->getStatus());
+		} catch (Exception $e) {
+			return new DataResponse(['error' => $e], Http::STATUS_CONFLICT);
 		}
 
 	}
 
 	/**
-	 * SendInvitation
-	 * Sent invitation mails for a share
+	 * Delete share
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 * @param string $token
 	 * @return DataResponse
 	 */
-	public function sendInvitation($token) {
+
+	public function delete($token) {
 		try {
-			return new DataResponse($this->mailService->sendInvitationMail($token), Http::STATUS_OK);
-		} catch (Exception $e) {
+			return new DataResponse(['share' => $this->shareService->delete($token)], Http::STATUS_OK);
+		} catch (NotAuthorizedException $e) {
 			return new DataResponse(['error' => $e->getMessage()], $e->getStatus());
+		} catch (DoesNotExistException $e) {
+			return new DataResponse($e, Http::STATUS_NOT_FOUND);
 		}
 	}
 
 	/**
-	 * delete share
+	 * Sent invitation mails for a share
 	 * @NoAdminRequired
 	 * @CORS
 	 * @NoCSRFRequired
 	 * @param string $token
 	 * @return DataResponse
 	 */
-
-	public function delete($token) {
+	public function sendInvitation($token) {
 		try {
-			return new DataResponse(['share' => $this->shareService->remove($token)], Http::STATUS_OK);
-		} catch (NotAuthorizedException $e) {
-			return new DataResponse(['error' => $e->getMessage()], $e->getStatus());
+			return new DataResponse($this->mailService->sendInvitationMail($token), Http::STATUS_OK);
 		} catch (Exception $e) {
-			return new DataResponse($e, Http::STATUS_NOT_FOUND);
+			return new DataResponse(['error' => $e->getMessage()], $e->getStatus());
 		}
 	}
 }