colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3535-group-sync-fix' into development

This commit is contained in:
Dan Brown 2022-06-28 11:47:22 +01:00
parent 65fa96e405 0bcd1795cb
commit d20aacb732
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Auth/Access/GroupSyncService.php
View File

@ -39,7 +39,7 @@ class GroupSyncService
protected function parseRoleExternalAuthId(string $externalId): array
{
$inputIds = preg_split('/(?<!\\\),/', $externalId);
$inputIds = preg_split('/(?<!\\\),/', strtolower($externalId));
$cleanIds = [];
foreach ($inputIds as $inputId) {

12
tests/Auth/GroupSyncServiceTest.php
View File

@ -54,4 +54,16 @@ class GroupSyncServiceTest extends TestCase
$user = User::query()->find($user->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));
}
}