Repository: airavata-php-gateway Updated Branches: refs/heads/master c76ab17e9 -> f4514f220
adding userName to AuthzToken claims map 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/f4514f22 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/f4514f22 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/f4514f22 Branch: refs/heads/master Commit: f4514f220f093350d58cb6832c0b9b58dc2a1a0e Parents: c76ab17 Author: Supun Nakandala <[email protected]> Authored: Sat Sep 5 00:08:25 2015 +0530 Committer: Supun Nakandala <[email protected]> Committed: Sat Sep 5 00:08:25 2015 +0530 ---------------------------------------------------------------------- app/controllers/AccountController.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/f4514f22/app/controllers/AccountController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index ada3349..99e3e8e 100755 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -92,16 +92,19 @@ class AccountController extends BaseController $accessToken = $response->access_token; $refreshToken = $response->refresh_token; $expirationTime = time() + $response->expires_in - 5; //5 seconds safe margin + + $userProfile = WSIS::getUserProfileFromOAuthToken($accessToken); + $userRoles = $userProfile['roles']; + $username = $userProfile['username']; + $authzToken = new Airavata\Model\Security\AuthzToken(); $authzToken->accessToken = $accessToken; + $authzToken->claimsMap = array('userName'=>$username); Session::put('authz-token',$authzToken); Session::put('oauth-refresh-code',$refreshToken); Session::put('oauth-expiration-time',$expirationTime); - - $userProfile = WSIS::getUserProfileFromOAuthToken($accessToken); Session::put("user-profile", $userProfile); - $userRoles = $userProfile['roles']; if (in_array(Config::get('pga_config.wsis')['admin-role-name'], $userRoles)) { Session::put("admin", true); } @@ -112,7 +115,6 @@ class AccountController extends BaseController Session::put("authorized-user", true); } - $username = $userProfile['username']; CommonUtilities::store_id_in_session($username); Session::put("gateway_id", Config::get('pga_config.airavata')['gateway-id']);
