Merge pull request #28858 from owncloud/stable10-untangle

[stable10] Untangle fed sharing inter-app dependencies

apps/federatedfilesharing/appinfo/app.php

@@ -2,6 +2,7 @@
 /**
  * @author Björn Schießle <[email protected]>
  * @author Joas Schilling <[email protected]>
+ * @author Jörn Friedrich Dreyer <[email protected]>
  *
  * @copyright Copyright (c) 2017, ownCloud GmbH
  * @license AGPL-3.0
@@ -23,6 +24,8 @@
 $app = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing');
 
 use OCA\FederatedFileSharing\Notifier;
+use OCP\Share\Events\AcceptShare;
+use OCP\Share\Events\DeclineShare;
 
 $manager = \OC::$server->getNotificationManager();
 $manager->registerNotifier(function() {
@@ -36,3 +39,36 @@
 		'name' => $l->t('Federated sharing'),
 	];
 });
+
+// add 'Add to your ownCloud' button to public pages
+// FIXME the OCA\Files::loadAdditionalScripts event is only fired by the ViewController of the files app ... but we are nowadays using webdav.
+// FIXME versions, comments, tags and sharing ui still uses it https://github.com/owncloud/core/search?utf8=%E2%9C%93&q=loadAdditionalScripts&type=
+OCP\Util::connectHook('OCP\Share', 'share_link_access', 'OCA\FederatedFileSharing\HookHandler', 'loadPublicJS');
+
+// react to accept and decline share events
+$eventDispatcher = \OC::$server->getEventDispatcher();
+$eventDispatcher->addListener(
+	AcceptShare::class,
+	function(AcceptShare $event) use ($app) {
+		/** @var \OCA\FederatedFileSharing\Notifications $notifications */
+		$notifications = $app->getContainer()->query('OCA\FederatedFileSharing\Notifications');
+		$notifications->sendAcceptShare(
+			$event->getRemote(),
+			$event->getRemoteId(),
+			$event->getShareToken()
+		);
+	}
+);
+
+$eventDispatcher->addListener(
+	DeclineShare::class,
+	function(DeclineShare $event) use ($app) {
+		/** @var \OCA\FederatedFileSharing\Notifications $notifications */
+		$notifications = $app->getContainer()->query('OCA\FederatedFileSharing\Notifications');
+		$notifications->sendDeclineShare(
+			$event->getRemote(),
+			$event->getRemoteId(),
+			$event->getShareToken()
+		);
+	}
+);

apps/federatedfilesharing/appinfo/info.xml

@@ -9,6 +9,9 @@
     <namespace>FederatedFileSharing</namespace>
     <use-migrations>true</use-migrations>
     <category>other</category>
+    <types>
+        <filesystem/>
+    </types>
     <dependencies>
 		<owncloud min-version="10.0.2.4" max-version="10.0" />
     </dependencies>

apps/federatedfilesharing/js/public.js

@@ -0,0 +1,10 @@
+$(document).ready(function() {
+	$('#header #details').prepend(
+		'<span id="save">' +
+		'	<button id="save-button">'+t('files_sharing', 'Add to your ownCloud')+'</button>' +
+		'	<form class="save-form hidden" action="#">' +
+		'		<input type="text" id="remote_address" placeholder="example.com/owncloud"/>' +
+		'		<button id="save-button-confirm" class="icon-confirm svg" disabled></button>' +
+		'	</form>' +
+		'</span>');
+});

apps/federatedfilesharing/lib/HookHandler.php

@@ -0,0 +1,37 @@
+<?php
+/**
+ * @author Jörn Friedrich Dreyer <[email protected]>
+ *
+ * @copyright Copyright (c) 2017, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OCA\FederatedFileSharing;
+
+/**
+ * Class HookHandler
+ * 
+ * handles hooks
+ *
+ * @package OCA\FederatedFileSharing
+ */
+class HookHandler {
+
+	public static function loadPublicJS () {
+		\OCP\Util::addScript('federatedfilesharing', 'public');
+	}
+
+}

apps/federatedfilesharing/lib/Notifications.php

@@ -162,7 +162,7 @@ public function requestReShare($token, $id, $shareId, $remote, $shareWith, $perm
 	 * @return bool
 	 */
 	public function sendRemoteUnShare($remote, $id, $token) {
-		$this->sendUpdateToRemote($remote, $id, $token, 'unshare');
+		return $this->sendUpdateToRemote($remote, $id, $token, 'unshare');
 	}
 
 	/**
@@ -174,7 +174,7 @@ public function sendRemoteUnShare($remote, $id, $token) {
 	 * @return bool
 	 */
 	public function sendRevokeShare($remote, $id, $token) {
-		$this->sendUpdateToRemote($remote, $id, $token, 'revoke');
+		return $this->sendUpdateToRemote($remote, $id, $token, 'revoke');
 	}
 
 	/**
@@ -187,7 +187,7 @@ public function sendRevokeShare($remote, $id, $token) {
 	 * @return bool
 	 */
 	public function sendPermissionChange($remote, $remoteId, $token, $permissions) {
-		$this->sendUpdateToRemote($remote, $remoteId, $token, 'permissions', ['permissions' => $permissions]);
+		return $this->sendUpdateToRemote($remote, $remoteId, $token, 'permissions', ['permissions' => $permissions]);
 	}
 
 	/**
@@ -258,7 +258,6 @@ public function sendUpdateToRemote($remote, $remoteId, $token, $action, $data =
 		return false;
 	}
 
-
 	/**
 	 * return current timestamp
 	 *

apps/federatedfilesharing/lib/RequestHandler.php

@@ -147,9 +147,8 @@ public function createShare($params) {
 					\OC::$server->getDatabaseConnection(),
 					\OC\Files\Filesystem::getMountManager(),
 					\OC\Files\Filesystem::getLoader(),
-					\OC::$server->getHTTPHelper(),
 					\OC::$server->getNotificationManager(),
-					$discoveryManager,
+					\OC::$server->getEventDispatcher(),
 					$shareWith
 				);
 

apps/federatedfilesharing/tests/RequestHandlerTest.php

@@ -249,9 +249,8 @@ function testDeleteUser($toDelete, $expected, $remainingUsers) {
 			\OC::$server->getDatabaseConnection(),
 			Filesystem::getMountManager(),
 			Filesystem::getLoader(),
-			\OC::$server->getHTTPHelper(),
 			\OC::$server->getNotificationManager(),
-			$discoveryManager,
+			\OC::$server->getEventDispatcher(),
 			$toDelete
 		);
 

apps/files_sharing/js/public.js

@@ -261,10 +261,10 @@ OCA.Sharing.PublicApp = {
 
 			var remote = $(this).find('input[type="text"]').val();
 			var token = $('#sharingToken').val();
-			var owner = $('#save').data('owner');
-			var ownerDisplayName = $('#save').data('owner-display-name');
-			var name = $('#save').data('name');
-			var isProtected = $('#save').data('protected') ? 1 : 0;
+			var owner = $('#header').data('owner');
+			var ownerDisplayName = $('#header').data('owner-display-name');
+			var name = $('#header').data('name');
+			var isProtected = $('#header').data('protected') ? 1 : 0;
 			OCA.Sharing.PublicApp._saveToOwnCloud(remote, token, owner, ownerDisplayName, name, isProtected);
 		});
 
@@ -335,7 +335,7 @@ OCA.Sharing.PublicApp = {
 
 		if(remote.substr(-1) !== '/') {
 			remote += '/'
-		};
+		}
 
 		var url = remote + 'index.php/apps/files#' + 'remote=' + encodeURIComponent(location) // our location is the remote for the other server
 			+ "&token=" + encodeURIComponent(token) + "&owner=" + encodeURIComponent(owner) +"&ownerDisplayName=" + encodeURIComponent(ownerDisplayName) + "&name=" + encodeURIComponent(name) + "&protected=" + isProtected;

apps/files_sharing/lib/API/Remote.php

@@ -36,17 +36,12 @@ class Remote {
 	 * @return \OC_OCS_Result
 	 */
 	public static function getOpenShares($params) {
-		$discoveryManager = new DiscoveryManager(
-			\OC::$server->getMemCacheFactory(),
-			\OC::$server->getHTTPClientService()
-		);
 		$externalManager = new Manager(
 			\OC::$server->getDatabaseConnection(),
 			Filesystem::getMountManager(),
 			Filesystem::getLoader(),
-			\OC::$server->getHTTPHelper(),
 			\OC::$server->getNotificationManager(),
-			$discoveryManager,
+			\OC::$server->getEventDispatcher(),
 			\OC_User::getUser()
 		);
 
@@ -60,17 +55,12 @@ public static function getOpenShares($params) {
 	 * @return \OC_OCS_Result
 	 */
 	public static function acceptShare($params) {
-		$discoveryManager = new DiscoveryManager(
-			\OC::$server->getMemCacheFactory(),
-			\OC::$server->getHTTPClientService()
-		);
 		$externalManager = new Manager(
 			\OC::$server->getDatabaseConnection(),
 			Filesystem::getMountManager(),
 			Filesystem::getLoader(),
-			\OC::$server->getHTTPHelper(),
 			\OC::$server->getNotificationManager(),
-			$discoveryManager,
+			\OC::$server->getEventDispatcher(),
 			\OC_User::getUser()
 		);
 
@@ -91,17 +81,12 @@ public static function acceptShare($params) {
 	 * @return \OC_OCS_Result
 	 */
 	public static function declineShare($params) {
-		$discoveryManager = new DiscoveryManager(
-			\OC::$server->getMemCacheFactory(),
-			\OC::$server->getHTTPClientService()
-		);
 		$externalManager = new Manager(
 			\OC::$server->getDatabaseConnection(),
 			Filesystem::getMountManager(),
 			Filesystem::getLoader(),
-			\OC::$server->getHTTPHelper(),
 			\OC::$server->getNotificationManager(),
-			$discoveryManager,
+			\OC::$server->getEventDispatcher(),
 			\OC_User::getUser()
 		);
 
@@ -139,17 +124,12 @@ private static function extendShareInfo($share) {
 	 * @return \OC_OCS_Result
 	 */
 	public static function getShares($params) {
-		$discoveryManager = new DiscoveryManager(
-			\OC::$server->getMemCacheFactory(),
-			\OC::$server->getHTTPClientService()
-		);
 		$externalManager = new Manager(
 			\OC::$server->getDatabaseConnection(),
 			Filesystem::getMountManager(),
 			Filesystem::getLoader(),
-			\OC::$server->getHTTPHelper(),
 			\OC::$server->getNotificationManager(),
-			$discoveryManager,
+			\OC::$server->getEventDispatcher(),
 			\OC_User::getUser()
 		);
 
@@ -167,17 +147,12 @@ public static function getShares($params) {
 	 * @return \OC_OCS_Result
 	 */
 	public static function getShare($params) {
-		$discoveryManager = new DiscoveryManager(
-			\OC::$server->getMemCacheFactory(),
-			\OC::$server->getHTTPClientService()
-		);
 		$externalManager = new Manager(
 			\OC::$server->getDatabaseConnection(),
 			Filesystem::getMountManager(),
 			Filesystem::getLoader(),
-			\OC::$server->getHTTPHelper(),
 			\OC::$server->getNotificationManager(),
-			$discoveryManager,
+			\OC::$server->getEventDispatcher(),
 			\OC_User::getUser()
 		);
 
@@ -198,17 +173,12 @@ public static function getShare($params) {
 	 * @return \OC_OCS_Result
 	 */
 	public static function unshare($params) {
-		$discoveryManager = new DiscoveryManager(
-			\OC::$server->getMemCacheFactory(),
-			\OC::$server->getHTTPClientService()
-		);
 		$externalManager = new Manager(
 			\OC::$server->getDatabaseConnection(),
 			Filesystem::getMountManager(),
 			Filesystem::getLoader(),
-			\OC::$server->getHTTPHelper(),
 			\OC::$server->getNotificationManager(),
-			$discoveryManager,
+			\OC::$server->getEventDispatcher(),
 			\OC_User::getUser()
 		);
 

apps/files_sharing/lib/AppInfo/Application.php

@@ -2,6 +2,7 @@
 /**
  * @author Björn Schießle <[email protected]>
  * @author Joas Schilling <[email protected]>
+ * @author Jörn Friedrich Dreyer <[email protected]>
  * @author Lukas Reschke <[email protected]>
  * @author Robin Appelman <[email protected]>
  * @author Roeland Jago Douma <[email protected]>
@@ -26,15 +27,13 @@
 
 namespace OCA\Files_Sharing\AppInfo;
 
-use OCA\FederatedFileSharing\DiscoveryManager;
 use OCA\Files_Sharing\MountProvider;
 use OCP\AppFramework\App;
 use OC\AppFramework\Utility\SimpleContainer;
 use OCA\Files_Sharing\Controllers\ExternalSharesController;
 use OCA\Files_Sharing\Controllers\ShareController;
 use OCA\Files_Sharing\Middleware\SharingCheckMiddleware;
 use \OCP\IContainer;
-use OCA\Files_Sharing\Capabilities;
 
 class Application extends App {
 	public function __construct(array $urlParams = []) {
@@ -47,7 +46,6 @@ public function __construct(array $urlParams = []) {
 		 * Controllers
 		 */
 		$container->registerService('ShareController', function (SimpleContainer $c) use ($server) {
-			$federatedSharingApp = new \OCA\FederatedFileSharing\AppInfo\Application('federatedfilesharing');
 			return new ShareController(
 				$c->query('AppName'),
 				$c->query('Request'),
@@ -59,8 +57,7 @@ public function __construct(array $urlParams = []) {
 				$server->getShareManager(),
 				$server->getSession(),
 				$server->getPreviewManager(),
-				$server->getRootFolder(),
-				$federatedSharingApp->getFederatedShareProvider()
+				$server->getRootFolder()
 			);
 		});
 		$container->registerService('ExternalSharesController', function (SimpleContainer $c) {
@@ -81,17 +78,12 @@ public function __construct(array $urlParams = []) {
 		$container->registerService('ExternalManager', function (SimpleContainer $c) use ($server) {
 			$user = $server->getUserSession()->getUser();
 			$uid = $user ? $user->getUID() : null;
-			$discoveryManager = new DiscoveryManager(
-				\OC::$server->getMemCacheFactory(),
-				\OC::$server->getHTTPClientService()
-			);
 			return new \OCA\Files_Sharing\External\Manager(
 				$server->getDatabaseConnection(),
 				\OC\Files\Filesystem::getMountManager(),
 				\OC\Files\Filesystem::getLoader(),
-				$server->getHTTPHelper(),
 				$server->getNotificationManager(),
-				$discoveryManager,
+				$server->getEventDispatcher(),
 				$uid
 			);
 		});