Move files_sharing Controllers => Controller
lib/Controller is the default location for controllers. So lets put them all in there. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
f054adb429
commit
f589f1a1d6
|
@ -32,8 +32,8 @@ use OCA\Files_Sharing\Middleware\OCSShareAPIMiddleware;
|
||||||
use OCA\Files_Sharing\MountProvider;
|
use OCA\Files_Sharing\MountProvider;
|
||||||
use OCP\AppFramework\App;
|
use OCP\AppFramework\App;
|
||||||
use OC\AppFramework\Utility\SimpleContainer;
|
use OC\AppFramework\Utility\SimpleContainer;
|
||||||
use OCA\Files_Sharing\Controllers\ExternalSharesController;
|
use OCA\Files_Sharing\Controller\ExternalSharesController;
|
||||||
use OCA\Files_Sharing\Controllers\ShareController;
|
use OCA\Files_Sharing\Controller\ShareController;
|
||||||
use OCA\Files_Sharing\Middleware\SharingCheckMiddleware;
|
use OCA\Files_Sharing\Middleware\SharingCheckMiddleware;
|
||||||
use \OCP\IContainer;
|
use \OCP\IContainer;
|
||||||
use OCP\IServerContainer;
|
use OCP\IServerContainer;
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OCA\Files_Sharing\Controllers;
|
namespace OCA\Files_Sharing\Controller;
|
||||||
|
|
||||||
use OCP\AppFramework\Controller;
|
use OCP\AppFramework\Controller;
|
||||||
use OCP\IRequest;
|
use OCP\IRequest;
|
||||||
|
@ -35,7 +35,7 @@ use OCP\AppFramework\Http\DataResponse;
|
||||||
/**
|
/**
|
||||||
* Class ExternalSharesController
|
* Class ExternalSharesController
|
||||||
*
|
*
|
||||||
* @package OCA\Files_Sharing\Controllers
|
* @package OCA\Files_Sharing\Controller
|
||||||
*/
|
*/
|
||||||
class ExternalSharesController extends Controller {
|
class ExternalSharesController extends Controller {
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
namespace OCA\Files_Sharing\Controllers;
|
namespace OCA\Files_Sharing\Controller;
|
||||||
|
|
||||||
use OC_Files;
|
use OC_Files;
|
||||||
use OC_Util;
|
use OC_Util;
|
|
@ -78,10 +78,10 @@ class SharingCheckMiddleware extends Middleware {
|
||||||
throw new NotFoundException('Sharing is disabled.');
|
throw new NotFoundException('Sharing is disabled.');
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($controller instanceof \OCA\Files_Sharing\Controllers\ExternalSharesController &&
|
if ($controller instanceof \OCA\Files_Sharing\Controller\ExternalSharesController &&
|
||||||
!$this->externalSharesChecks()) {
|
!$this->externalSharesChecks()) {
|
||||||
throw new S2SException('Federated sharing not allowed');
|
throw new S2SException('Federated sharing not allowed');
|
||||||
} else if ($controller instanceof \OCA\Files_Sharing\Controllers\ShareController &&
|
} else if ($controller instanceof \OCA\Files_Sharing\Controller\ShareController &&
|
||||||
!$this->isLinkSharingEnabled()) {
|
!$this->isLinkSharingEnabled()) {
|
||||||
throw new NotFoundException('Link sharing is disabled');
|
throw new NotFoundException('Link sharing is disabled');
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
namespace OCA\Files_Sharing\Tests\Controllers;
|
namespace OCA\Files_Sharing\Tests\Controllers;
|
||||||
|
|
||||||
use OCA\Files_Sharing\Controllers\ExternalSharesController;
|
use OCA\Files_Sharing\Controller\ExternalSharesController;
|
||||||
use OCP\AppFramework\Http\DataResponse;
|
use OCP\AppFramework\Http\DataResponse;
|
||||||
use OCP\AppFramework\Http\JSONResponse;
|
use OCP\AppFramework\Http\JSONResponse;
|
||||||
use OCP\Http\Client\IClientService;
|
use OCP\Http\Client\IClientService;
|
|
@ -33,7 +33,7 @@ namespace OCA\Files_Sharing\Tests\Controllers;
|
||||||
|
|
||||||
use OC\Files\Filesystem;
|
use OC\Files\Filesystem;
|
||||||
use OCA\FederatedFileSharing\FederatedShareProvider;
|
use OCA\FederatedFileSharing\FederatedShareProvider;
|
||||||
use OCA\Files_Sharing\Controllers\ShareController;
|
use OCA\Files_Sharing\Controller\ShareController;
|
||||||
use OCP\AppFramework\Http\DataResponse;
|
use OCP\AppFramework\Http\DataResponse;
|
||||||
use OCP\Share\Exceptions\ShareNotFound;
|
use OCP\Share\Exceptions\ShareNotFound;
|
||||||
use OCP\AppFramework\Http\NotFoundResponse;
|
use OCP\AppFramework\Http\NotFoundResponse;
|
||||||
|
@ -96,7 +96,7 @@ class ShareControllerTest extends \Test\TestCase {
|
||||||
->method('isIncomingServer2serverShareEnabled')->willReturn(true);
|
->method('isIncomingServer2serverShareEnabled')->willReturn(true);
|
||||||
$this->eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
|
$this->eventDispatcher = $this->getMockBuilder('Symfony\Component\EventDispatcher\EventDispatcherInterface')->getMock();
|
||||||
|
|
||||||
$this->shareController = new \OCA\Files_Sharing\Controllers\ShareController(
|
$this->shareController = new \OCA\Files_Sharing\Controller\ShareController(
|
||||||
$this->appName,
|
$this->appName,
|
||||||
$this->getMockBuilder('\OCP\IRequest')->getMock(),
|
$this->getMockBuilder('\OCP\IRequest')->getMock(),
|
||||||
$this->config,
|
$this->config,
|
Loading…
Reference in New Issue