Compare commits

..

No commits in common. "6a957ecd3e919df8cbc3bfb0a9ae024f3256eafb" and "d881a404bd5f196e5653ad90904e1ce36143bf33" have entirely different histories.

2 changed files with 7 additions and 6 deletions

View File

@ -6,7 +6,7 @@
"authors": [
{
"name": "Dave Mc Nicoll",
"email": "info@mcnd.ca"
"email": "mcndave@gmail.com"
}
],
"require": {

View File

@ -6,7 +6,8 @@ use Taxus\Taxus;
use Psr\Http\Message\ResponseInterface;
use Notes\ObjectResolver;
use Notes\ObjectReflection,
Notes\ObjectResolver;
class SecurityHandler {
@ -25,7 +26,7 @@ class SecurityHandler {
public function verify(string $className, string $methodName) : ? ResponseInterface
{
# Should generate an equivalent of Ulmus's object reflection here !
if ( $security = $this->getClassAttributes(Attribute\Security::class, $className, $methodName) ) {
if ( $security = $this->getClassAnnotations(Annotation\Security::class, $className, $methodName) ) {
return array_pop($security)->locked ? $this->redirectResponse : null;
}
@ -34,7 +35,7 @@ class SecurityHandler {
public function taxus(string $className, string $methodName, object $user = null) : ? ResponseInterface
{
if ($taxus = $this->getClassAttributes(Attribute\Taxus::class, $className, $methodName)) {
if ($taxus = $this->getClassAnnotations(Annotation\Taxus::class, $className, $methodName)) {
if ($this->unauthorizeResponse) {
foreach ($taxus as $item) {
if (!isset($item->privilege) || $this->taxus->granted($item->privilege, $user, $item)) {
@ -52,12 +53,12 @@ class SecurityHandler {
return null;
}
protected function getClassAttributes(string $annotationClass, string $className, string $methodName)/* : \Notes\Annotation|array */
protected function getClassAnnotations(string $annotationClass, string $className, string $methodName)/* : \Notes\Annotation|array */
{
$objectResolver = new ObjectResolver($className, true, true, false, true);
try {
$method = $objectResolver->getAttributeListFromClassname( $annotationClass, false );
$method = $objectResolver->getAnnotationListFromClassname( $annotationClass, false );
}
catch(\Exception $e) { }