Skip to content

fixed rule creation for childs #25

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
merged 1 commit into from
Mar 3, 2020
Merged

fixed rule creation for childs #25

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
14 changes: 11 additions & 3 deletions db/RbacMigration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ protected function generatePrivileges($privileges = [])
if (isset($privilege['children']) && \is_array($privilege['children'])) {
foreach ($privilege['children'] as $child_privilege) {
$created_child_privilege = $this->createPrivilege($child_privilege['name'],
$child_privilege['type']);
$child_privilege['type'],
$child_privilege['rule'] ?? [] );

// check if parent already has child or if parent can have this as a child
if (!$this->authManager->hasChild($parent_privilege,
Expand Down Expand Up @@ -133,21 +134,25 @@ protected function generatePrivileges($privileges = [])
*/
protected function createPrivilege($name, $type, $rule_data = [])
{

$type_name = ($type === Item::TYPE_ROLE ? 'Role' : 'Permission');

$getter = 'get' . $type_name;

// check if permission or role exists and create it
if ($this->authManager->{$getter}($name) === null) {
echo "Creating $type_name: $name".PHP_EOL;
$privilege = $this->authManager->{'create' . $type_name}($name);

if (!empty($rule_data)) {
echo "Creating rule...".PHP_EOL;
$privilege->ruleName = $this->createRule($rule_data['name'], $rule_data['class'])->name;
}

if (!$this->authManager->add($privilege)) {
throw new ErrorException('Cannot create ' . mb_strtolower($type_name) . ' ' . $name);
}
} else {
echo "$name exists [skipping]".PHP_EOL;
}

return $this->authManager->{$getter}($name);
Expand All @@ -172,9 +177,12 @@ public function safeDown()
protected function createRule($name, $class)
{
if ($this->authManager->getRule($name) === null) {
$this->authManager->add(new $class([
$result = $this->authManager->add(new $class([
'name' => $name,
]));
if (!$result) {
throw new \Exception('Can not create rule');
}
}
return $this->authManager->getRule($name);
}
Expand Down