AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added unit tests for middleware

Browse Source
This commit is contained in:
Frederic Guillot
2016-05-15 20:56:01 -04:00
parent 8a6f02735b
commit 4eaab1f6da
7 changed files with 293 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Core/Controller/BaseMiddleware.php
View File

@@ -25,7 +25,7 @@ abstract class BaseMiddleware extends Base
/**
* Set next middleware
*
* @param BaseMiddleware|null $nextMiddleware
* @param BaseMiddleware $nextMiddleware
* @return BaseMiddleware
*/
public function setNextMiddleware(BaseMiddleware $nextMiddleware)

2
app/Core/Helper.php
View File

@@ -94,7 +94,7 @@ class Helper
{
$container = $this->container;
$this->helpers[$property] = function() use($className, $container) {
$this->helpers[$property] = function() use ($className, $container) {
return new $className($container);
};

6
app/Middleware/AuthenticationMiddleware.php
View File

@@ -33,7 +33,7 @@ class AuthenticationMiddleware extends BaseMiddleware
protected function handleAuthentication()
{
if (! $this->userSession->isLogged() && ! $this->authenticationManager->preAuthentication()) {
$this->setNextMiddleware(null);
$this->nextMiddleware = null;
if ($this->request->isAjax()) {
$this->response->text('Not Authorized', 401);
@@ -44,10 +44,10 @@ class AuthenticationMiddleware extends BaseMiddleware
}
}
private function isPublicAccess()
protected function isPublicAccess()
{
if ($this->applicationAuthorization->isAllowed($this->router->getController(), $this->router->getAction(), Role::APP_PUBLIC)) {
$this->setNextMiddleware(null);
$this->nextMiddleware = null;
return true;
}

2
app/Middleware/PostAuthenticationMiddleware.php
View File

@@ -22,7 +22,7 @@ class PostAuthenticationMiddleware extends BaseMiddleware
$ignore = ($controller === 'twofactor' && in_array($action, array('code', 'check'))) || ($controller === 'auth' && $action === 'logout');
if ($ignore === false && $this->userSession->hasPostAuthentication() && ! $this->userSession->isPostAuthenticationValidated()) {
$this->setNextMiddleware(null);
$this->nextMiddleware = null;
if ($this->request->isAjax()) {
$this->response->text('Not Authorized', 401);