split authentication required and secured controllers
This commit is contained in:
parent
45a22c2dd4
commit
6d7d09eb57
@ -22,13 +22,11 @@ if ($match !== null) {
|
|||||||
$handler = $route->getHandler();
|
$handler = $route->getHandler();
|
||||||
$controller = new $handler[0](Container::$request);
|
$controller = new $handler[0](Container::$request);
|
||||||
|
|
||||||
if ($controller instanceof SokoWeb\Interfaces\Authorization\ISecured) {
|
if (
|
||||||
$authorized = $controller->authorize();
|
$controller instanceof SokoWeb\Interfaces\Authentication\IAuthenticationRequired &&
|
||||||
} else {
|
$controller->isAuthenticationRequired() &&
|
||||||
$authorized = true;
|
Container::$request->user() === null
|
||||||
}
|
) {
|
||||||
|
|
||||||
if (!$authorized) {
|
|
||||||
Container::$request->session()->set('redirect_after_login', substr($_SERVER['REQUEST_URI'], strlen('/')));
|
Container::$request->session()->set('redirect_after_login', substr($_SERVER['REQUEST_URI'], strlen('/')));
|
||||||
$response = new Redirect(Container::$routeCollection->getRoute('login')->generateLink(), IRedirect::TEMPORARY);
|
$response = new Redirect(Container::$routeCollection->getRoute('login')->generateLink(), IRedirect::TEMPORARY);
|
||||||
header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
|
header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
|
||||||
@ -42,14 +40,19 @@ if ($match !== null) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
$response = call_user_func([$controller, $handler[1]]);
|
if (
|
||||||
if ($response instanceof SokoWeb\Interfaces\Response\IContent) {
|
!($controller instanceof SokoWeb\Interfaces\Authorization\ISecured) ||
|
||||||
header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
|
$controller->authorize()
|
||||||
$response->render();
|
) {
|
||||||
return;
|
$response = call_user_func([$controller, $handler[1]]);
|
||||||
} elseif ($response instanceof SokoWeb\Interfaces\Response\IRedirect) {
|
if ($response instanceof SokoWeb\Interfaces\Response\IContent) {
|
||||||
header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
|
header('Content-Type: ' . $response->getContentType() . '; charset=UTF-8');
|
||||||
return;
|
$response->render();
|
||||||
|
return;
|
||||||
|
} elseif ($response instanceof SokoWeb\Interfaces\Response\IRedirect) {
|
||||||
|
header('Location: ' . $response->getUrl(), true, $response->getHttpCode());
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7,14 +7,14 @@ use RVR\PersistentData\Model\User;
|
|||||||
use RVR\Repository\CommunityRepository;
|
use RVR\Repository\CommunityRepository;
|
||||||
use RVR\Repository\CommunityMemberRepository;
|
use RVR\Repository\CommunityMemberRepository;
|
||||||
use RVR\Repository\UserRepository;
|
use RVR\Repository\UserRepository;
|
||||||
use SokoWeb\Interfaces\Authorization\ISecured;
|
use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
|
||||||
use SokoWeb\Interfaces\Request\IRequest;
|
use SokoWeb\Interfaces\Request\IRequest;
|
||||||
use SokoWeb\Interfaces\Response\IContent;
|
use SokoWeb\Interfaces\Response\IContent;
|
||||||
use SokoWeb\PersistentData\PersistentDataManager;
|
use SokoWeb\PersistentData\PersistentDataManager;
|
||||||
use SokoWeb\Response\HtmlContent;
|
use SokoWeb\Response\HtmlContent;
|
||||||
use SokoWeb\Response\JsonContent;
|
use SokoWeb\Response\JsonContent;
|
||||||
|
|
||||||
class CommunityController implements ISecured
|
class CommunityController implements IAuthenticationRequired
|
||||||
{
|
{
|
||||||
private IRequest $request;
|
private IRequest $request;
|
||||||
|
|
||||||
@ -35,9 +35,9 @@ class CommunityController implements ISecured
|
|||||||
$this->communityMemberRepository = new CommunityMemberRepository();
|
$this->communityMemberRepository = new CommunityMemberRepository();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function authorize(): bool
|
public function isAuthenticationRequired(): bool
|
||||||
{
|
{
|
||||||
return $this->request->user() !== null;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getCommunityHome(): ?IContent
|
public function getCommunityHome(): ?IContent
|
||||||
|
@ -2,12 +2,12 @@
|
|||||||
|
|
||||||
use RVR\PersistentData\Model\User;
|
use RVR\PersistentData\Model\User;
|
||||||
use RVR\Repository\CommunityMemberRepository;
|
use RVR\Repository\CommunityMemberRepository;
|
||||||
use SokoWeb\Interfaces\Authorization\ISecured;
|
use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
|
||||||
use SokoWeb\Interfaces\Request\IRequest;
|
use SokoWeb\Interfaces\Request\IRequest;
|
||||||
use SokoWeb\Interfaces\Response\IContent;
|
use SokoWeb\Interfaces\Response\IContent;
|
||||||
use SokoWeb\Response\HtmlContent;
|
use SokoWeb\Response\HtmlContent;
|
||||||
|
|
||||||
class HomeController implements ISecured
|
class HomeController implements IAuthenticationRequired
|
||||||
{
|
{
|
||||||
private IRequest $request;
|
private IRequest $request;
|
||||||
|
|
||||||
@ -19,9 +19,9 @@ class HomeController implements ISecured
|
|||||||
$this->communityMemberRepository = new CommunityMemberRepository();
|
$this->communityMemberRepository = new CommunityMemberRepository();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function authorize(): bool
|
public function isAuthenticationRequired(): bool
|
||||||
{
|
{
|
||||||
return $this->request->user() !== null;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getHome(): IContent
|
public function getHome(): IContent
|
||||||
|
@ -4,14 +4,14 @@ use DateTime;
|
|||||||
use RVR\PersistentData\Model\OAuthToken;
|
use RVR\PersistentData\Model\OAuthToken;
|
||||||
use RVR\PersistentData\Model\User;
|
use RVR\PersistentData\Model\User;
|
||||||
use RVR\Repository\OAuthClientRepository;
|
use RVR\Repository\OAuthClientRepository;
|
||||||
use SokoWeb\Interfaces\Authorization\ISecured;
|
use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
|
||||||
use SokoWeb\Interfaces\Request\IRequest;
|
use SokoWeb\Interfaces\Request\IRequest;
|
||||||
use SokoWeb\Interfaces\Response\IRedirect;
|
use SokoWeb\Interfaces\Response\IRedirect;
|
||||||
use SokoWeb\Response\Redirect;
|
use SokoWeb\Response\Redirect;
|
||||||
use SokoWeb\PersistentData\PersistentDataManager;
|
use SokoWeb\PersistentData\PersistentDataManager;
|
||||||
use SokoWeb\Response\HtmlContent;
|
use SokoWeb\Response\HtmlContent;
|
||||||
|
|
||||||
class OAuthAuthController implements ISecured
|
class OAuthAuthController implements IAuthenticationRequired
|
||||||
{
|
{
|
||||||
private IRequest $request;
|
private IRequest $request;
|
||||||
|
|
||||||
@ -26,9 +26,9 @@ class OAuthAuthController implements ISecured
|
|||||||
$this->oAuthClientRepository = new OAuthClientRepository();
|
$this->oAuthClientRepository = new OAuthClientRepository();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function authorize(): bool
|
public function isAuthenticationRequired(): bool
|
||||||
{
|
{
|
||||||
return $this->request->user() !== null;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function auth()
|
public function auth()
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
use DateTime;
|
use DateTime;
|
||||||
use SokoWeb\Http\Request;
|
use SokoWeb\Http\Request;
|
||||||
use SokoWeb\Interfaces\Authorization\ISecured;
|
use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
|
||||||
use SokoWeb\Interfaces\Request\IRequest;
|
use SokoWeb\Interfaces\Request\IRequest;
|
||||||
use SokoWeb\Interfaces\Response\IContent;
|
use SokoWeb\Interfaces\Response\IContent;
|
||||||
use SokoWeb\Interfaces\Response\IRedirect;
|
use SokoWeb\Interfaces\Response\IRedirect;
|
||||||
@ -15,7 +15,7 @@ use SokoWeb\Response\Redirect;
|
|||||||
use SokoWeb\Util\JwtParser;
|
use SokoWeb\Util\JwtParser;
|
||||||
use RVR\Repository\UserRepository;
|
use RVR\Repository\UserRepository;
|
||||||
|
|
||||||
class UserController implements ISecured
|
class UserController implements IAuthenticationRequired
|
||||||
{
|
{
|
||||||
private IRequest $request;
|
private IRequest $request;
|
||||||
|
|
||||||
@ -30,9 +30,9 @@ class UserController implements ISecured
|
|||||||
$this->userRepository = new UserRepository();
|
$this->userRepository = new UserRepository();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function authorize(): bool
|
public function isAuthenticationRequired(): bool
|
||||||
{
|
{
|
||||||
return $this->request->user() !== null;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getAccount(): IContent
|
public function getAccount(): IContent
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
<?php namespace RVR\Controller;
|
<?php namespace RVR\Controller;
|
||||||
|
|
||||||
use RVR\Repository\UserRepository;
|
use RVR\Repository\UserRepository;
|
||||||
use SokoWeb\Interfaces\Authorization\ISecured;
|
use SokoWeb\Interfaces\Authentication\IAuthenticationRequired;
|
||||||
use SokoWeb\Interfaces\Request\IRequest;
|
use SokoWeb\Interfaces\Request\IRequest;
|
||||||
use SokoWeb\Interfaces\Response\IContent;
|
use SokoWeb\Interfaces\Response\IContent;
|
||||||
use SokoWeb\Response\JsonContent;
|
use SokoWeb\Response\JsonContent;
|
||||||
|
|
||||||
class UserSearchController implements ISecured
|
class UserSearchController implements IAuthenticationRequired
|
||||||
{
|
{
|
||||||
private IRequest $request;
|
private IRequest $request;
|
||||||
|
|
||||||
@ -18,9 +18,9 @@ class UserSearchController implements ISecured
|
|||||||
$this->userRepository = new UserRepository();
|
$this->userRepository = new UserRepository();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function authorize(): bool
|
public function isAuthenticationRequired(): bool
|
||||||
{
|
{
|
||||||
return $this->request->user() !== null;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function searchUser(): IContent
|
public function searchUser(): IContent
|
||||||
|
Loading…
Reference in New Issue
Block a user