Merge pull request #18461 from nextcloud/fix/noid/ensure-entity-on-scope-extension
Flows that are managing themselves do not necessarily set the entity
This commit is contained in:
commit
47a4a037ae
|
@ -121,14 +121,16 @@ class RuleMatcher implements IRuleMatcher {
|
|||
$operations = array_merge($operations, $this->manager->getOperations($class, $scope));
|
||||
}
|
||||
|
||||
$additionalScopes = $this->manager->getAllConfiguredScopesForOperation($class);
|
||||
foreach ($additionalScopes as $hash => $scopeCandidate) {
|
||||
/** @var ScopeContext $scopeCandidate */
|
||||
if ($scopeCandidate->getScope() !== IManager::SCOPE_USER || in_array($scopeCandidate, $scopes)) {
|
||||
continue;
|
||||
}
|
||||
if ($this->entity->isLegitimatedForUserId($scopeCandidate->getScopeId())) {
|
||||
$operations = array_merge($operations, $this->manager->getOperations($class, $scopeCandidate));
|
||||
if($this->entity instanceof IEntity) {
|
||||
$additionalScopes = $this->manager->getAllConfiguredScopesForOperation($class);
|
||||
foreach ($additionalScopes as $hash => $scopeCandidate) {
|
||||
/** @var ScopeContext $scopeCandidate */
|
||||
if ($scopeCandidate->getScope() !== IManager::SCOPE_USER || in_array($scopeCandidate, $scopes)) {
|
||||
continue;
|
||||
}
|
||||
if ($this->entity->isLegitimatedForUserId($scopeCandidate->getScopeId())) {
|
||||
$operations = array_merge($operations, $this->manager->getOperations($class, $scopeCandidate));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue