AIRAVATA-2342 Fixing getting user profile for role management
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/e4c524e8 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/e4c524e8 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/e4c524e8 Branch: refs/heads/develop Commit: e4c524e891de891a3dc3625faf9ef5fd1f323e9b Parents: b55a828 Author: Marcus Christie <[email protected]> Authored: Fri Mar 24 15:53:16 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Fri Mar 24 15:53:16 2017 -0400 ---------------------------------------------------------------------- app/controllers/AdminController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/e4c524e8/app/controllers/AdminController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php index 94b11b8..46caa9a 100644 --- a/app/controllers/AdminController.php +++ b/app/controllers/AdminController.php @@ -233,7 +233,7 @@ class AdminController extends BaseController { $newCurrentRoles = Keycloak::getUserRoles($userId); if(in_array(Config::get("pga_config.wsis")["admin-role-name"], $newCurrentRoles) || in_array(Config::get("pga_config.wsis")["read-only-admin-role-name"], $newCurrentRoles) || in_array(Config::get("pga_config.wsis")["user-role-name"], $newCurrentRoles)){ - $userProfile = Keycloak::getUserProfile($userId); + $userProfile = Keycloak::getUserProfile(Input::get("username")); $recipients = array($userProfile["email"]); $this->sendAccessGrantedEmailToTheUser(Input::get("username"), $userId, $recipients); @@ -327,7 +327,7 @@ class AdminController extends BaseController { $mail->isHTML(true); $mail->Subject = "Your user account (".$username.") privileges changed!"; - $userProfile = Keycloak::getUserProfile($userId); + $userProfile = Keycloak::getUserProfile($username); $wsisConfig = Config::get('pga_config.wsis'); if( $wsisConfig['tenant-domain'] == "") $username = $username;
