Merge branch 'AIRAVATA-2502'
diff --git a/app/libraries/IamAdminServicesUtilities.php b/app/libraries/IamAdminServicesUtilities.php
index fbb208e..3ba50df 100644
--- a/app/libraries/IamAdminServicesUtilities.php
+++ b/app/libraries/IamAdminServicesUtilities.php
@@ -33,7 +33,7 @@
$user_profiles = IamAdminServices::getUsersWithRole($authz_token, $role_name);
$users = [];
foreach ($user_profiles as $user_profile) {
- $users[] = $user_profile->userId;
+ array_push($users, (object)["firstName"=>$user_profile->firstName,"lastName"=>$user_profile->lastName,"email"=>implode(",",$user_profile->emails),"userName"=>$user_profile->userId]);
}
return $users;
}
diff --git a/app/libraries/Keycloak/Keycloak.php b/app/libraries/Keycloak/Keycloak.php
index 25a059e..6b7efe8 100644
--- a/app/libraries/Keycloak/Keycloak.php
+++ b/app/libraries/Keycloak/Keycloak.php
@@ -251,7 +251,7 @@
$users = $this->users->getUsers($this->realm);
$usernames = [];
foreach ($users as $user) {
- $usernames[] = $user->username;
+ array_push($usernames, (object)["firstName"=>$user->firstName,"lastName"=>$user->lastName,"email"=>$user->email,"userName"=>$user->username]);
}
return $usernames;
}
@@ -267,7 +267,7 @@
$users = $this->users->searchUsers($this->realm, $phrase);
$usernames = [];
foreach ($users as $user) {
- $usernames[] = $user->username;
+ array_push($usernames, (object)["firstName"=>$user->firstName,"lastName"=>$user->lastName,"email"=>$user->email,"userName"=>$user->username]);
}
return $usernames;
}
@@ -447,3 +447,4 @@
return $json;
}
}
+
diff --git a/app/views/admin/manage-users.blade.php b/app/views/admin/manage-users.blade.php
index c8ea524..1b038cb 100644
--- a/app/views/admin/manage-users.blade.php
+++ b/app/views/admin/manage-users.blade.php
@@ -54,7 +54,11 @@
<table class="table table-striped table-condensed">
<tr>
+ <th>First Name</th>
+ <th>Last Name</th>
<th>Username</th>
+ <th>Email</th>
+
<th>
Role :
<select onchange="location = this.options[this.selectedIndex].value;">
@@ -77,10 +81,13 @@
</tr>
@foreach( (array)$users as $user)
<tr class="user-row">
- <td>{{ $user }}</td>
+ <td>{{ $user->firstName }}</td>
+ <td>{{ $user->lastName }}</td>
+ <td>{{ $user->userName }}</td>
+ <td>{{ $user->email }}</td>
<td>
<button class="button btn btn-default check-roles" type="button"
- data-username="{{$user}}">Check All Roles
+ data-username="{{$user->userName}}">Check All Roles
</button>
<div class="user-roles"></div>
</td>
@@ -280,4 +287,4 @@
});
}
</script>
-@stop
\ No newline at end of file
+@stop
