Skip to content

Commit d5a3445

Browse files
authored
Merge pull request #16 from cmu-sei/username-email-fix
looking keycloak user by email
2 parents fe78475 + c3cf587 commit d5a3445

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

classes/crucible.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1366,10 +1366,10 @@ public function get_keycloak_groups() {
13661366

13671367
$realmUrl = preg_replace('#/admin/([^/]+)/console$#', '/admin/realms/$1', rtrim($realmUrl, '/'));
13681368

1369-
$username = $USER->username;
1369+
$email = $USER->email;
13701370

13711371
// Build user search URL
1372-
$userSearchUrl = $realmUrl . '/users?username=' . urlencode($username);
1372+
$userSearchUrl = $realmUrl . '/users?email=' . urlencode($email);
13731373

13741374
// Prepare request
13751375
curl_setopt($ch, CURLOPT_URL, $userSearchUrl);
@@ -1384,7 +1384,7 @@ public function get_keycloak_groups() {
13841384

13851385
// Defensive check
13861386
if (!is_array($userlist) || empty($userlist)) {
1387-
debugging("No users found in Keycloak matching username: $username", DEBUG_DEVELOPER);
1387+
debugging("No users found in Keycloak matching email: $email", DEBUG_DEVELOPER);
13881388
return 0;
13891389
}
13901390

@@ -1499,15 +1499,15 @@ public function get_keycloak_roles() {
14991499

15001500
$realmUrl = preg_replace('#/admin/([^/]+)/console$#', '/admin/realms/$1', rtrim($realmUrl, '/'));
15011501

1502-
$username = $USER->username;
1503-
15041502
// Set the headers with the Authorization token.
15051503
$headers = [
15061504
"Authorization: Bearer $accessToken",
15071505
];
15081506

1507+
$email = $USER->email;
1508+
15091509
// Build user search URL
1510-
$userSearchUrl = $realmUrl . '/users?username=' . urlencode($username);
1510+
$userSearchUrl = $realmUrl . '/users?email=' . urlencode($email);
15111511

15121512
// Prepare request
15131513
curl_setopt($ch, CURLOPT_URL, $userSearchUrl);
@@ -1522,7 +1522,7 @@ public function get_keycloak_roles() {
15221522

15231523
// Defensive check
15241524
if (!is_array($userlist) || empty($userlist)) {
1525-
debugging("No users found in Keycloak matching username: $username", DEBUG_DEVELOPER);
1525+
debugging("No users found in Keycloak matching email: $email", DEBUG_DEVELOPER);
15261526
return 0;
15271527
}
15281528

version.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
defined('MOODLE_INTERNAL') || die;
4444

45-
$plugin->version = 2025052101;
45+
$plugin->version = 2025052102;
4646
$plugin->requires = 2021051100;
4747
$plugin->component = 'block_crucible';
4848
$plugin->maturity = MATURITY_ALPHA;

0 commit comments

Comments
 (0)