ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Cleanup Middleware

Browse Source
This commit is contained in:
Julius Haertl
2017-01-13 16:47:15 +01:00
parent da34d7167f
commit 75168332e9
2 changed files with 4 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/Middleware/SharingMiddleware.php
View File

@@ -23,51 +23,18 @@
namespace OCA\Deck\Middleware; namespace OCA\Deck\Middleware;
use OCA\Deck\Controller\BoardController;
use OCA\Deck\Controller\CardController;
use OCA\Deck\Controller\LabelController;
use OCA\Deck\Controller\PageController;
use OCA\Deck\Db\AclMapper;
use OCA\Deck\NoPermissionException;
use OCA\Deck\NotFoundException;
use OCA\Deck\Service\PermissionService;
use OCA\Deck\StatusException; use OCA\Deck\StatusException;
use \OCP\AppFramework\Middleware; use \OCP\AppFramework\Middleware;
use OCP\IContainer;
use OCP\IGroupManager;
use OCP\IRequest;
use OCA\Deck\Controller\StackController;
use OCP\IUserSession;
use OCP\AppFramework\Http\JSONResponse; use OCP\AppFramework\Http\JSONResponse;
use OC\AppFramework\Utility\ControllerMethodReflector;
use OCA\Deck\Db\Acl;
class SharingMiddleware extends Middleware { class SharingMiddleware extends Middleware {
private $container;
private $request;
private $userSession;
private $reflector;
private $permissionService;
public function __construct(
IContainer $container,
IRequest $request,
IUserSession $userSession,
ControllerMethodReflector $reflector,
PermissionService $permissionService
) {
$this->container = $container;
$this->request = $request;
$this->userSession = $userSession;
$this->reflector = $reflector;
$this->permissionService = $permissionService;
}
/** /**
* Return JSON error response if the user has no sufficient permission * Return JSON error response if the user has no sufficient permission
* *

24
tests/unit/Middleware/SharingMiddlewareTest.php
View File

@@ -44,31 +44,9 @@ use OCA\Deck\Db\AclMapper;
class SharingMiddlewareTest extends \PHPUnit_Framework_TestCase { class SharingMiddlewareTest extends \PHPUnit_Framework_TestCase {
private $sharingMiddleware; private $sharingMiddleware;
private $container;
private $request;
private $userSession;
private $reflector;
private $permissionService;
public function setUp() { public function setUp() {
$this->container = $this->getMockBuilder(IContainer::class) $this->sharingMiddleware = new SharingMiddleware();
->disableOriginalConstructor()->getMock();
$this->request = $this->getMockBuilder(IRequest::class)
->disableOriginalConstructor()->getMock();
$this->userSession = $this->getMockBuilder(IUserSession::class)
->disableOriginalConstructor()->getMock();
$this->reflector = new ControllerMethodReflector();
//$this->getMockBuilder(ControllerMethodReflector::class)
// ->disableOriginalConstructor()->getMock();
$this->permissionService = $this->getMockBuilder(PermissionService::class)
->disableOriginalConstructor()->getMock();
$this->sharingMiddleware = new SharingMiddleware(
$this->container,
$this->request,
$this->userSession,
$this->reflector,
$this->permissionService
);
} }