Merge pull request #1069 from nextcloud/fix/1068/invalid-role-scope

julien-nc · web-flow · commit 3ccad1e5f28a · 2025-03-03T13:42:56.000+01:00
Fix wrong role attribute scope
diff --git a/lib/Service/ProvisioningService.php b/lib/Service/ProvisioningService.php
@@ -338,7 +338,7 @@ public function provisionUser(string $tokenUserId, int $providerId, object $idTo
 		$this->eventDispatcher->dispatchTyped($event);
 		$this->logger->debug('Role mapping event dispatched');
 		if ($event->hasValue() && $event->getValue() !== null && $event->getValue() !== '') {
-			$account->setProperty('role', $event->getValue(), '1', '');
+			$account->setProperty('role', $event->getValue(), $defaultScopes[IAccountManager::PROPERTY_ROLE] ?? $fallbackScope, '1', '');
 		}
 
 		// Update the headline

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ public function provisionUser(string $tokenUserId, int $providerId, object $idTo`
`338`	`338`	`$this->eventDispatcher->dispatchTyped($event);`
`339`	`339`	`$this->logger->debug('Role mapping event dispatched');`
`340`	`340`	`if ($event->hasValue() && $event->getValue() !== null && $event->getValue() !== '') {`
`341`		`- $account->setProperty('role', $event->getValue(), '1', '');`
	`341`	`+ $account->setProperty('role', $event->getValue(), $defaultScopes[IAccountManager::PROPERTY_ROLE] ?? $fallbackScope, '1', '');`
`342`	`342`	`}`
`343`	`343`
`344`	`344`	`// Update the headline`