mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-09-13 13:04:52 +00:00
Merge branch '3535-group-sync-fix' into development
This commit is contained in:
commit
d20aacb732
@ -39,7 +39,7 @@ class GroupSyncService
|
|||||||
|
|
||||||
protected function parseRoleExternalAuthId(string $externalId): array
|
protected function parseRoleExternalAuthId(string $externalId): array
|
||||||
{
|
{
|
||||||
$inputIds = preg_split('/(?<!\\\),/', $externalId);
|
$inputIds = preg_split('/(?<!\\\),/', strtolower($externalId));
|
||||||
$cleanIds = [];
|
$cleanIds = [];
|
||||||
|
|
||||||
foreach ($inputIds as $inputId) {
|
foreach ($inputIds as $inputId) {
|
||||||
|
@ -54,4 +54,16 @@ class GroupSyncServiceTest extends TestCase
|
|||||||
$user = User::query()->find($user->id);
|
$user = User::query()->find($user->id);
|
||||||
$this->assertTrue($user->hasRole($role->id));
|
$this->assertTrue($user->hasRole($role->id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function test_external_auth_id_matches_ignoring_case()
|
||||||
|
{
|
||||||
|
$user = $this->getViewer();
|
||||||
|
$role = Role::factory()->create(['display_name' => 'ABC123', 'external_auth_id' => 'WaRRioRs']);
|
||||||
|
$this->assertFalse($user->hasRole($role->id));
|
||||||
|
|
||||||
|
(new GroupSyncService())->syncUserWithFoundGroups($user, ['wArriors', 'penguiNs'], false);
|
||||||
|
|
||||||
|
$user = User::query()->find($user->id);
|
||||||
|
$this->assertTrue($user->hasRole($role->id));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user