You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/06/28 17:58:51 UTC
airavata-php-gateway git commit: WIP
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop 0afc120c1 -> 78adc905e
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/78adc905
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/78adc905
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/78adc905
Branch: refs/heads/develop
Commit: 78adc905ef810a65cf1eb83d22ad34ac8491d10c
Parents: 0afc120
Author: scnakandala <su...@gmail.com>
Authored: Wed Jun 28 13:58:49 2017 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Jun 28 13:58:49 2017 -0400
----------------------------------------------------------------------
app/controllers/AccountController.php | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/78adc905/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index a266f6b..ea0bdda 100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -170,7 +170,7 @@ 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);
+ return $this->initializeWithAiravata($username, $userEmail, $firstName, $lastName, $accessToken);
}
if(Session::has("admin") || Session::has("admin-read-only")){
@@ -259,7 +259,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){
+ private function initializeWithAiravata($username, $userEmail, $firstName, $lastName, $accessToken){
// 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 +291,9 @@ class AccountController extends BaseController
Session::put('user-profile', $userProfile);
if(Session::has("admin") || Session::has("admin-read-only")){
- return Redirect::to("admin/dashboard");
+ return Redirect::route("admin/dashboard", array('status'=>'ok', 'code'=>$accessToken));
}else{
- return Redirect::to("account/dashboard");
+ return Redirect::route("account/dashboard", array('status'=>'ok', 'code'=>$accessToken));
}
}