AVSDev/sprinkle-organisations
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

No longer need to override authorization manager

Browse Source
This commit is contained in:
Craig Williams
2023-06-07 11:12:32 +01:00
parent de85fd6e47
commit 58a1b2d316
2 changed files with 4 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
src/Authorize/AuthorizationManager.php
View File

@@ -1,94 +0,0 @@
<?php
/*
* AVSDev UF Organisations (https://avsdev.uk)
*
* @link https://git.avsdev.uk/avsdev/sprinkle-organisations
* @license https://git.avsdev.uk/avsdev/sprinkle-organisations/blob/master/LICENSE.md (LGPL-3.0 License)
*/
namespace UserFrosting\Sprinkle\Organisations\Authorize;
use Illuminate\Support\Arr;
use Psr\Container\ContainerInterface;
use UserFrosting\Sprinkle\Account\Database\Models\Interfaces\UserInterface;
use UserFrosting\Sprinkle\Account\Authorize\AuthorizationManager as UFAuthorizationManager;
/**
* AuthorizationManager class.
*
* Extends the authorization manager and allows for running an authorization callback without fetching it from the internal list.
*
* @author Craig Williams (https://avsdev.uk)
*/
class AuthorizationManager extends UFAuthorizationManager
{
/**
* Run a registered callback directly.
*
* @param string $name
* @param object $user
* @param ... $args
*/
public function runCallback($user, $name, ...$args)
{
$debug = $this->ci->config['debug.auth'];
$logger = $this->ci->authLogger;
if (is_null($user) || !($user instanceof UserInterface)) {
if ($debug) {
$this->ci->authLogger->debug('No user defined. Access denied.');
}
return false;
}
// The master (root) account has access to everything.
// Need to use loose comparison for now, because some DBs return `id` as a string.
if ($user->id == $this->ci->config['reserved_user_ids.master']) {
if ($debug) {
$this->ci->authLogger->debug('User is the master (root) user. Access granted.');
}
return true;
}
if ($debug) {
$trace = array_slice(debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 3), 1);
$this->ci->authLogger->debug('Authorization check requested at: ', $trace);
$this->ci->authLogger->debug("Checking authorization for user {$user->id} ('{$user->user_name}') against check '$name'...");
}
if (!array_key_exists($name, $this->callbacks) || !isset($this->callbacks[$name])) {
if ($debug) {
$this->ci->authLogger->debug('No matching callback found. Access denied.');
}
return false;
}
try {
if ($debug) {
$this->ci->authLogger->debug("Calling check '{$name}' with arguments:", $args);
}
$result = call_user_func_array($this->callbacks[$name], $args);
if ($result === true) {
if ($debug) {
$this->ci->authLogger->debug("User passed check '{$name}'. Access granted.");
}
return true;
}
return $result;
} catch (Exception $e) {
if ($this->debug) {
$this->logger->debug("Error running check '$name':" . $e->getMessage() . ". Access denied.");
}
return false;
}
}
}

12
src/ServicesProvider/ServicesProvider.php
View File

@@ -19,7 +19,6 @@ use UserFrosting\Sprinkle\Organisations\Database\Models\User;
use UserFrosting\Sprinkle\Organisations\Twig\OrganisationsExtension;
use UserFrosting\Sprinkle\Organisations\Repository\OrganisationApprovalRepository;
use UserFrosting\Sprinkle\Organisations\Repository\OrganisationMembershipApprovalRepository;
use UserFrosting\Sprinkle\Organisations\Authorize\AuthorizationManager;
/**
@@ -61,9 +60,6 @@ class ServicesProvider
* @return \UserFrosting\Sprinkle\Core\Util\ClassMapper
*/
$container->extend('authorizer', function ($authorizer, $c) {
$new_authorizer = new AuthorizationManager($c, $authorizer->getCallbacks());
/*
* Check if all $user is a member of $organisation.
*
@@ -71,7 +67,7 @@ class ServicesProvider
* @param int $organisation_id the id of the target organisation.
* @return bool true if $user is a member of $organisation.
*/
$new_authorizer->addCallback('is_organisation_member', function ($user_id, $organisation_id, $explicit = false) {
$authorizer->addCallback('is_organisation_member', function ($user_id, $organisation_id, $explicit = false) {
$query = Capsule::table('organisation_members')
->where('user_id', $user_id)
->where('organisation_id', $organisation_id)
@@ -91,7 +87,7 @@ class ServicesProvider
* @param int $organisation_id the id of the target organisation.
* @return bool true if $user is an administrator of $organisation.
*/
$new_authorizer->addCallback('is_organisation_admin', function ($user_id, $organisation_id) {
$authorizer->addCallback('is_organisation_admin', function ($user_id, $organisation_id) {
return Capsule::table('organisation_members')
->where('user_id', $user_id)
->where('organisation_id', $organisation_id)
@@ -107,7 +103,7 @@ class ServicesProvider
* @param bool $check_is_admin also check if A can administrate B.
* @return bool true if $user_A_id in an organisation with $user_B_id in.
*/
$new_authorizer->addCallback('has_matching_organisation', function ($user_A_id, $user_B_id, $check_is_admin = false) {
$authorizer->addCallback('has_matching_organisation', function ($user_A_id, $user_B_id, $check_is_admin = false) {
$user_A = User::findInt($user_A_id);
$user_B = User::findInt($user_B_id);
@@ -128,7 +124,7 @@ class ServicesProvider
return false;
});
return $new_authorizer;
return $authorizer;
});
/*