implement RESHARE_UNDO notification

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>

3 files changed, 18 insertions, 5 deletions

diff --git a/apps/federatedfilesharing/lib/Controller/RequestHandlerController.php b/apps/federatedfilesharing/lib/Controller/RequestHandlerController.php
index 0b490b57575..30330accddf 100644
--- a/apps/federatedfilesharing/lib/Controller/RequestHandlerController.php
+++ b/apps/federatedfilesharing/lib/Controller/RequestHandlerController.php
@@ -370,7 +370,7 @@ class RequestHandlerController extends OCSController {
 
 		try {
 			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			$provider->notificationReceived('SHARE_UNSHARE', $id, $notification);
+			$provider->notificationReceived('RESHARE_UNDO', $id, $notification);
 			return new Http\DataResponse();
 		} catch (\Exception $e) {
 			throw new OCSBadRequestException();
diff --git a/apps/federatedfilesharing/lib/Notifications.php b/apps/federatedfilesharing/lib/Notifications.php
index 36eb88e31a2..e15e9c2f6ab 100644
--- a/apps/federatedfilesharing/lib/Notifications.php
+++ b/apps/federatedfilesharing/lib/Notifications.php
@@ -319,8 +319,10 @@ class Notifications {
 
 		// if possible we use the new OCM API
 		$ocmResult = $this->tryOCMEndPoint($remoteDomain, $fields, $action);
-		if ($ocmResult) {
+		if (is_array($ocmResult)) {
 			$result['success'] = true;
+			$result['result'] = json_encode([
+				'ocs' => ['meta' => ['statuscode' => 200]]]);
 			return $result;
 		}
 
@@ -440,10 +442,22 @@ class Notifications {
 					$fields['remoteId'],
 					[
 						'sharedSecret' => $fields['token'],
+						'messgage' => 'file is no longer shared with you'
+					]
+				);
+				return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
+			case 'reshare_undo':
+				// if a reshare was unshared we send the information to the initiator/owner
+				$notification = $this->cloudFederationFactory->getCloudFederationNotification();
+				$notification->setMessage('RESHARE_UNDO',
+					'file',
+					$fields['remoteId'],
+					[
+						'sharedSecret' => $fields['token'],
+						'message' => 'reshare was revoked'
 					]
 				);
 				return $this->federationProviderManager->sendNotification($remoteDomain, $notification);
-				return false;
 		}
 
 		return false;
diff --git a/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php b/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php
index dc022e4f9c8..cc14d35a3d0 100644
--- a/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php
+++ b/apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php
@@ -456,7 +456,6 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
 	 * @throws ShareNotFoundException
 	 */
 	private function undoReshare($id, $notification) {
-
 		if (!isset($notification['sharedSecret'])) {
 			throw new BadRequestException(['sharedSecret']);
 		}
@@ -470,7 +469,7 @@ class CloudFederationProviderFiles implements ICloudFederationProvider {
 	}
 
 	private function unshare($id, $notification) {
-		error_log("new unshare!");
+
 		if (!$this->isS2SEnabled(true)) {
 			throw new ActionNotSupportedException("incoming shares disabled!");
 		}