Repository: airavata-php-gateway Updated Branches: refs/heads/develop ba061350a -> 352e58374
wip 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/352e5837 Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/352e5837 Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/352e5837 Branch: refs/heads/develop Commit: 352e58374601c316cff7730f767b3eb3a6bb2f33 Parents: ba06135 Author: scnakandala <[email protected]> Authored: Wed Jun 28 14:36:59 2017 -0400 Committer: scnakandala <[email protected]> Committed: Wed Jun 28 14:36:59 2017 -0400 ---------------------------------------------------------------------- app/controllers/AccountController.php | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/352e5837/app/controllers/AccountController.php ---------------------------------------------------------------------- diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php index 1fe3724..a99880e 100644 --- a/app/controllers/AccountController.php +++ b/app/controllers/AccountController.php @@ -170,13 +170,15 @@ class AccountController extends BaseController Session::put("gateway_id", Config::get('pga_config.airavata')['gateway-id']); if(Session::has("admin") || Session::has("admin-read-only") || Session::has("authorized-user")){ - return $this->initializeWithAiravata($username, $userEmail, $firstName, $lastName, $accessToken); + return $this->initializeWithAiravata($username, $userEmail, $firstName, $lastName, $accessToken, $refreshToken, $expirationTime); } if(Session::has("admin") || Session::has("admin-read-only")){ - return Redirect::to("admin/dashboard". "?status=ok&code=".$accessToken . "&username=".$username); + return Redirect::to("admin/dashboard". "?status=ok&code=".$accessToken . "&username=".$username + . "refresh_code=" . $refreshToken . "&valid_time=" . $expirationTime); }else{ - return Redirect::to("account/dashboard". "?status=ok&code=".$accessToken . "&username=".$username); + return Redirect::to("account/dashboard". "?status=ok&code=".$accessToken . "&username=".$username + . "refresh_code=" . $refreshToken . "&valid_time=" . $expirationTime); } } @@ -241,13 +243,15 @@ class AccountController extends BaseController Session::put("gateway_id", Config::get('pga_config.airavata')['gateway-id']); if(Session::get("admin") || Session::get("admin-read-only") || Session::get("authorized-user")){ - return $this->initializeWithAiravata($username, $userEmail, $firstName, $lastName, $accessToken); + return $this->initializeWithAiravata($username, $userEmail, $firstName, $lastName, $accessToken, $refreshToken, $expirationTime); } if(Session::has("admin") || Session::has("admin-read-only")){ - return Redirect::to("admin/dashboard" . "?status=ok&code=" . $accessToken . "&username=".$username); + return Redirect::to("admin/dashboard" . "?status=ok&code=" . $accessToken . "&username=".$username + . "refresh_code=" . $refreshToken . "&valid_time=" . $expirationTime); }else{ - return Redirect::to("account/dashboard" . "?status=ok&code=".$accessToken . "&username=".$username); + return Redirect::to("account/dashboard" . "?status=ok&code=".$accessToken . "&username=".$username + . "refresh_code=" . $refreshToken . "&valid_time=" . $expirationTime); } } @@ -259,7 +263,7 @@ class AccountController extends BaseController or in_array(Config::get('pga_config.wsis')['user-role-name'], $roles) or in_array(Config::get('pga_config.wsis')['initial-role-name'], $roles); } - private function initializeWithAiravata($username, $userEmail, $firstName, $lastName, $accessToken){ + private function initializeWithAiravata($username, $userEmail, $firstName, $lastName, $accessToken, $refreshToken, $validTime){ // Log the user out if Airavata is down. If a new user we want to make // sure we create the default project and setup experiment storage @@ -291,9 +295,11 @@ class AccountController extends BaseController Session::put('user-profile', $userProfile); if(Session::has("admin") || Session::has("admin-read-only")){ - return Redirect::to("admin/dashboard". "?status=ok&code=".$accessToken . "&username=".$username); + return Redirect::to("admin/dashboard". "?status=ok&code=".$accessToken . "&username=".$username + . "refresh_code=" . $refreshToken . "&valid_time=" . $validTime); }else{ - return Redirect::to("account/dashboard". "?status=ok&code=".$accessToken ."&username=".$username); + return Redirect::to("account/dashboard". "?status=ok&code=".$accessToken ."&username=".$username + . "refresh_code=" . $refreshToken . "&valid_time=" . $validTime); } }
