Add backend for deleting share requests

appinfo/routes.php

@@ -52,6 +52,7 @@ return [
 		['name' => 'share#getVaultsByUser', 'url' => '/api/v2/sharing/vaults/{user_id}', 'verb' => 'GET'],
         ['name' => 'share#applyIntermediateShare', 'url' => '/api/v2/sharing/share', 'verb' => 'POST'],
         ['name' => 'share#savePendingRequest', 'url' => '/api/v2/sharing/save', 'verb' => 'POST'],
+        ['name' => 'share#unshareCredential', 'url' => '/api/v2/sharing/unshare/{item_guid}', 'verb' => 'DELETE'],
         ['name' => 'share#getPendingRequests', 'url' => '/api/v2/sharing/pending', 'verb' => 'GET'],
         ['name' => 'share#deleteShareRequest', 'url' => '/api/v2/sharing/decline/{share_request_id}', 'verb' => 'DELETE'],
         ['name' => 'share#getVaultItems', 'url' => '/api/v2/sharing/vault/{vault_guid}/get', 'verb' => 'GET'],

controller/sharecontroller.php

@@ -123,6 +123,21 @@ class ShareController extends ApiController {
 	}
 
 
+	/**
+	 * @NoAdminRequired
+	 */
+	public function unshareCredential($item_guid){
+		$acl_list = $this->shareService->getCredentialAclList($item_guid);
+		$request_list = $this->shareService->getShareRequestsByGuid($item_guid);
+		foreach ($acl_list as $ACL){
+			$this->shareService->deleteShareACL($ACL);
+		}
+		foreach($request_list as $request){
+			$this->shareService->deleteShareRequest($request);
+		}
+		return new JSONResponse(array('result' => true));
+	}
+
 	/**
 	 * @NoAdminRequired
 	 */

lib/Db/ShareRequestMapper.php

@@ -61,4 +61,9 @@ class ShareRequestMapper extends Mapper {
 		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE id = ?";
 		return $this->findEntity($q, [$id]);
 	}
+
+	public function getShareRequestsByGuid($item_guid){
+		$q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE 	item_guid = ?";
+		return $this->findEntities($q, [$item_guid]);
+	}
 }

lib/Db/SharingACLMapper.php

@@ -48,4 +48,19 @@ class SharingACLMapper extends Mapper {
         $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE user_id = ? AND vault_guid = ?";
         return $this->findEntities($q, [$user_id, $vault_id]);
     }
+
+    /**
+     * Gets the currently accepted share requests from the given user for the given vault guid
+     * @param $user_id
+     * @param $vault_id
+     * @return SharingACL[]
+     */
+    public function getCredentialAclList($item_guid) {
+        $q = "SELECT * FROM ". self::TABLE_NAME ." WHERE item_guid = ?";
+        return $this->findEntities($q, [$item_guid]);
+    }
+
+    public function deleteShareACL(SharingACL $ACL){
+    	return $this->delete($ACL);
+	}
 }

lib/Service/ShareService.php

@@ -34,6 +34,7 @@ class ShareService {
 	 *      vault_id:   The id of the target vault
 	 *      guid:       The guid of the target vault
 	 *      key:        The shared key cyphered with the target vault RSA public key
+	 *
 	 * @param $target_item_id   string      The shared item ID
 	 * @param $target_item_guid string      The shared item GUID
 	 * @param $request_array    array
@@ -61,6 +62,7 @@ class ShareService {
 
 	/**
 	 * Applies the given share, defaults to no expire
+	 *
 	 * @param $item_guid
 	 * @param $target_vault_guid
 	 * @param $final_shared_key
@@ -86,6 +88,7 @@ class ShareService {
 
 	/**
 	 * Obtains pending requests for the given user ID
+	 *
 	 * @param $user_id
 	 * @return \OCA\Passman\Db\ShareRequest[]
 	 */
@@ -112,6 +115,7 @@ class ShareService {
 
 	/**
 	 * Deletes an share reuqest by id
+	 *
 	 * @param ShareRequest $request
 	 * @return \OCA\Passman\Db\ShareRequest[]
 	 */
@@ -134,4 +138,43 @@ class ShareService {
 		return $this->shareRequest->getRequestByGuid($item_guid, $target_vault_guid);
 	}
 
+	/**
+	 * Get the access control list by item guid
+	 *
+	 * @param string $item_guid
+	 * @return \OCA\Passman\Db\SharingACL[]
+	 */
+	public function getCredentialAclList($item_guid) {
+		return $this->sharingACL->getCredentialAclList($item_guid);
+	}
+
+	/**
+	 * Get pending share requests by guid
+	 *
+	 * @param  string $item_guid
+	 * @return \OCA\Passman\Db\ShareRequest[]
+	 */
+	public function getShareRequestsByGuid($item_guid) {
+		return $this->shareRequest->getShareRequestsByGuid($item_guid);
+	}
+
+	/**
+	 * Get pending share requests by guid
+	 *
+	 * @param  ShareRequest $request
+	 * @return \OCA\Passman\Db\ShareRequest[]
+	 */
+	public function deleteShareRequest(ShareRequest $request) {
+		return $this->shareRequest->deleteShareRequest($request);
+	}
+
+	/**
+	 * Get pending share requests by guid
+	 *
+	 * @param  ShareRequest $request
+	 * @return \OCA\Passman\Db\ShareRequest[]
+	 */
+	public function deleteShareACL(SharingACL $ACL) {
+		return $this->sharingACL->deleteShareACL($ACL);
+	}
 }