Skip to content

SessionMiddleware: declare session property #16913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Aug 29, 2019
Merged

SessionMiddleware: declare session property #16913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/private/AppFramework/DependencyInjection/DIContainer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,6 @@ public function __construct($appName, $urlParams = array(), ServerContainer $ser

$dispatcher->registerMiddleware(
new SessionMiddleware(
$c->query(IRequest::class),
$c->query(IControllerMethodReflector::class),
$c->query(ISession::class)
)
Expand Down
23 changes: 6 additions & 17 deletions lib/private/AppFramework/Middleware/SessionMiddleware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,14 @@

class SessionMiddleware extends Middleware {

/**
* @var IRequest
*/
private $request;

/**
* @var ControllerMethodReflector
*/
/** @var ControllerMethodReflector */
private $reflector;

/**
* @param IRequest $request
* @param ControllerMethodReflector $reflector
*/
public function __construct(IRequest $request,
ControllerMethodReflector $reflector,
ISession $session
) {
$this->request = $request;
/** @var ISession */
private $session;

public function __construct(ControllerMethodReflector $reflector,
ISession $session) {
$this->reflector = $reflector;
$this->session = $session;
}
Expand Down
16 changes: 4 additions & 12 deletions tests/lib/AppFramework/Middleware/SessionMiddlewareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,20 +25,12 @@ class SessionMiddlewareTest extends \Test\TestCase {
/** @var ControllerMethodReflector */
private $reflector;

/** @var Request */
private $request;

/** @var Controller */
private $controller;

protected function setUp() {
parent::setUp();

$this->request = new Request(
[],
$this->getMockBuilder('\OCP\Security\ISecureRandom')->getMock(),
$this->getMockBuilder(IConfig::class)->getMock()
);
$this->reflector = new ControllerMethodReflector();
$this->controller = $this->createMock(Controller::class);
}
Expand All @@ -50,7 +42,7 @@ public function testSessionNotClosedOnBeforeController() {
$session = $this->getSessionMock(0);

$this->reflector->reflect($this, __FUNCTION__);
$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
$middleware = new SessionMiddleware($this->reflector, $session);
$middleware->beforeController($this->controller, __FUNCTION__);
}

Expand All @@ -61,23 +53,23 @@ public function testSessionClosedOnAfterController() {
$session = $this->getSessionMock(1);

$this->reflector->reflect($this, __FUNCTION__);
$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
$middleware = new SessionMiddleware($this->reflector, $session);
$middleware->afterController($this->controller, __FUNCTION__, new Response());
}

public function testSessionClosedOnBeforeController() {
$session = $this->getSessionMock(1);

$this->reflector->reflect($this, __FUNCTION__);
$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
$middleware = new SessionMiddleware($this->reflector, $session);
$middleware->beforeController($this->controller, __FUNCTION__);
}

public function testSessionNotClosedOnAfterController() {
$session = $this->getSessionMock(0);

$this->reflector->reflect($this, __FUNCTION__);
$middleware = new SessionMiddleware($this->request, $this->reflector, $session);
$middleware = new SessionMiddleware($this->reflector, $session);
$middleware->afterController($this->controller, __FUNCTION__, new Response());
}

Expand Down