You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2018/01/04 21:00:56 UTC
[airavata-php-gateway] branch master updated (cb0a276 -> f562846)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git.
from cb0a276 Merge pull request #80 from neeraj-lad/AIRAVATA-2571
add 9e22a81 AIRAVATA-2571 Add userEnabled to getUsersWithRole
new 092026e Merge branch 'AIRAVATA-2571-email-verified'
new f562846 AIRAVATA-2571 User enabled instead of email verified
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
app/libraries/IamAdminServicesUtilities.php | 3 ++-
app/libraries/Keycloak/Keycloak.php | 6 ++++--
app/views/admin/manage-users.blade.php | 7 ++++---
3 files changed, 10 insertions(+), 6 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@airavata.apache.org" <co...@airavata.apache.org>'].
[airavata-php-gateway] 02/02: AIRAVATA-2571 User enabled instead of
email verified
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git
commit f562846623659a0c37830fad197fc7f6003f722e
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Dec 13 15:27:12 2017 -0500
AIRAVATA-2571 User enabled instead of email verified
---
app/libraries/Keycloak/Keycloak.php | 6 ++++--
app/views/admin/manage-users.blade.php | 7 ++++---
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/app/libraries/Keycloak/Keycloak.php b/app/libraries/Keycloak/Keycloak.php
index 5315c6e..46b5c94 100644
--- a/app/libraries/Keycloak/Keycloak.php
+++ b/app/libraries/Keycloak/Keycloak.php
@@ -259,7 +259,8 @@ class Keycloak {
$users = $this->users->getUsers($this->realm);
$usernames = [];
foreach ($users as $user) {
- array_push($usernames, (object)["firstName"=>$user->firstName,"lastName"=>$user->lastName,"email"=>$user->email,"emailVerified"=>$user->emailVerified,"userName"=>$user->username]);
+ Log::debug("user", array($user));
+ array_push($usernames, (object)["firstName"=>$user->firstName,"lastName"=>$user->lastName,"email"=>$user->email,"userEnabled"=>$user->enabled,"userName"=>$user->username]);
}
return $usernames;
}
@@ -275,7 +276,7 @@ class Keycloak {
$users = $this->users->searchUsers($this->realm, $phrase);
$usernames = [];
foreach ($users as $user) {
- array_push($usernames, (object)["firstName"=>$user->firstName,"lastName"=>$user->lastName,"email"=>$user->email,"userName"=>$user->username]);
+ array_push($usernames, (object)["firstName"=>$user->firstName,"lastName"=>$user->lastName,"email"=>$user->email,"userEnabled"=>$user->enabled,"userName"=>$user->username]);
}
return $usernames;
}
@@ -374,6 +375,7 @@ class Keycloak {
$result["email"] = $user->email;
$result["firstname"] = $user->firstName;
$result["lastname"] = $user->lastName;
+ $result["userEnabled"] = $user->enabled;
return $result;
}else{
return [];
diff --git a/app/views/admin/manage-users.blade.php b/app/views/admin/manage-users.blade.php
index 166ca0f..e2affb8 100644
--- a/app/views/admin/manage-users.blade.php
+++ b/app/views/admin/manage-users.blade.php
@@ -58,7 +58,7 @@
<th>Last Name</th>
<th>Username</th>
<th>Email</th>
- <th>Email Verified</th>
+ <th>User Enabled</th>
<th>
Role :
@@ -86,14 +86,15 @@
<td>{{ $user->lastName }}</td>
<td>{{ $user->userName }}</td>
<td>{{ $user->email }}</td>
- @if($user->emailVerified)
+ @if($user->userEnabled)
<td class="text-success"><span class="glyphicon glyphicon-ok"></span></td>
@else
<td class="text-danger"><span class="glyphicon glyphicon-remove"></span></td>
@endif
<td>
<button class="button btn btn-default check-roles" type="button"
- data-username="{{$user->userName}}">Check All Roles
+ data-username="{{$user->userName}}"
+ @if(!$user->userEnabled)disabled @endif>Check All Roles
</button>
<div class="user-roles"></div>
</td>
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.
[airavata-php-gateway] 01/02: Merge branch
'AIRAVATA-2571-email-verified'
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git
commit 092026e0891226408125e03d67a6ec45a39f759d
Merge: cb0a276 9e22a81
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Thu Jan 4 15:57:15 2018 -0500
Merge branch 'AIRAVATA-2571-email-verified'
app/libraries/IamAdminServicesUtilities.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.