Split files_sharing middelware

Since for external shares there is no need for link shares to be enabled
we should check which controller is actually being called.

This makes sure that in all cases we verify that the files_sharing app
is enabled. But only for the share controller (public shares) we check
if the API is enabled and if links are enabled.

TODO: add checks for federated sharing as well

1 files changed, 28 insertions, 29 deletions

diff --git a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
index 3171d45d331..a43b11c81b6 100644
--- a/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
+++ b/apps/files_sharing/tests/middleware/sharingcheckmiddleware.php
@@ -51,13 +51,27 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 		$this->sharingCheckMiddleware = new SharingCheckMiddleware('files_sharing', $this->config, $this->appManager);
 	}
 
-	public function testIsSharingEnabledWithEverythingEnabled() {
+	public function testIsSharingEnabledWithAppEnabled() {
 		$this->appManager
 			->expects($this->once())
 			->method('isEnabledForUser')
 			->with('files_sharing')
 			->will($this->returnValue(true));
 
+		$this->assertTrue(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+	}
+
+	public function testIsSharingEnabledWithAppDisabled() {
+		$this->appManager
+			->expects($this->once())
+			->method('isEnabledForUser')
+			->with('files_sharing')
+			->will($this->returnValue(false));
+
+		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+	}
+
+	public function testIsLinkSharingEnabledWithEverythinEnabled() {
 		$this->config
 			->expects($this->at(0))
 			->method('getAppValue')
@@ -70,26 +84,11 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 			->with('core', 'shareapi_allow_links', 'yes')
 			->will($this->returnValue('yes'));
 
-		$this->assertTrue(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+		$this->assertTrue(self::invokePrivate($this->sharingCheckMiddleware, 'isLinkSharingEnabled'));
 	}
 
-	public function testIsSharingEnabledWithAppDisabled() {
-		$this->appManager
-			->expects($this->once())
-			->method('isEnabledForUser')
-			->with('files_sharing')
-			->will($this->returnValue(false));
-
-		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
-	}
-
-	public function testIsSharingEnabledWithLinkSharingDisabled() {
-		$this->appManager
-			->expects($this->once())
-			->method('isEnabledForUser')
-			->with('files_sharing')
-			->will($this->returnValue(true));
 
+	public function testIsLinkSharingEnabledWithLinkSharingDisabled() {
 		$this->config
 			->expects($this->at(0))
 			->method('getAppValue')
@@ -102,23 +101,17 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 			->with('core', 'shareapi_allow_links', 'yes')
 			->will($this->returnValue('no'));
 
-		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isLinkSharingEnabled'));
 	}
 
-	public function testIsSharingEnabledWithSharingAPIDisabled() {
-		$this->appManager
-			->expects($this->once())
-			->method('isEnabledForUser')
-			->with('files_sharing')
-			->will($this->returnValue(true));
-
+	public function testIsLinkSharingEnabledWithSharingAPIDisabled() {
 		$this->config
 			->expects($this->once())
 			->method('getAppValue')
 			->with('core', 'shareapi_enabled', 'yes')
 			->will($this->returnValue('no'));
 
-		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isSharingEnabled'));
+		$this->assertFalse(self::invokePrivate($this->sharingCheckMiddleware, 'isLinkSharingEnabled'));
 	}
 
 	public function testBeforeControllerWithSharingEnabled() {
@@ -140,7 +133,10 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 			->with('core', 'shareapi_allow_links', 'yes')
 			->will($this->returnValue('yes'));
 
-		$this->sharingCheckMiddleware->beforeController($this->controllerMock, 'myMethod');
+		$controller = $this->getMockBuilder('\OCA\Files_Sharing\Controllers\ShareController')
+			->disableOriginalConstructor()->getMock();
+
+		$this->sharingCheckMiddleware->beforeController($controller, 'myMethod');
 	}
 
 	/**
@@ -154,7 +150,10 @@ class SharingCheckMiddlewareTest extends \Test\TestCase {
 			->with('files_sharing')
 			->will($this->returnValue(false));
 
-		$this->sharingCheckMiddleware->beforeController($this->controllerMock, 'myMethod');
+		$controller = $this->getMockBuilder('\OCA\Files_Sharing\Controllers\ShareController')
+			->disableOriginalConstructor()->getMock();
+
+		$this->sharingCheckMiddleware->beforeController($controller, 'myMethod');
 	}
 
 	/**