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 2015/09/10 21:16:40 UTC
[2/2] airavata-php-gateway git commit: fixing Auth token not set issue
fixing Auth token not set issue
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/bdbcd9bc
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/bdbcd9bc
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/bdbcd9bc
Branch: refs/heads/master
Commit: bdbcd9bc5795d4a83e26d336bdf0ea73a358cf04
Parents: 489ab48
Author: Supun Nakandala <sc...@apache.org>
Authored: Fri Sep 11 00:46:16 2015 +0530
Committer: Supun Nakandala <sc...@apache.org>
Committed: Fri Sep 11 00:46:16 2015 +0530
----------------------------------------------------------------------
app/controllers/AccountController.php | 5 +++++
app/libraries/Airavata/AiravataServiceProvider.php | 14 --------------
2 files changed, 5 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bdbcd9bc/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index b5ea899..ebf5b93 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -156,6 +156,11 @@ class AccountController extends BaseController
Session::put("user-profile", $userProfile);
}
+ $authzToken = new Airavata\Model\Security\AuthzToken();
+ $authzToken->accessToken = "emptyToken";
+ $authzToken->claimsMap = array('userName'=>$username);
+ Session::put('authz-token',$authzToken);
+
CommonUtilities::store_id_in_session($username);
Session::put("gateway_id", Config::get('pga_config.airavata')['gateway-id']);
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/bdbcd9bc/app/libraries/Airavata/AiravataServiceProvider.php
----------------------------------------------------------------------
diff --git a/app/libraries/Airavata/AiravataServiceProvider.php b/app/libraries/Airavata/AiravataServiceProvider.php
index 3bcd120..53a8c39 100755
--- a/app/libraries/Airavata/AiravataServiceProvider.php
+++ b/app/libraries/Airavata/AiravataServiceProvider.php
@@ -38,20 +38,6 @@ class AiravataServiceProvider extends ServiceProvider {
$this->app['airavata'] = $this->app->share(function($app)
{
try{
-// $options = array();
-// if(Config::get('pga_config.airavata')['verify-peer']){
-// $options = array(
-// 'verify-peer'=>Config::get('pga_config.airavata')['verify-peer'],
-// 'certfile'=>Config::get('pga_config.airavata')['cafile-path'],
-// 'selfsign'=> Config::get('pga_config.airavata')['allow-self-signed-cert']
-// );
-// }
-//
-// $transport = new TSSLSocket(
-// Config::get('pga_config.airavata')['airavata-server'],
-// Config::get('pga_config.airavata')['airavata-port'],
-// $options
-// );
$transport = new TSocket(
Config::get('pga_config.airavata')['airavata-server'],
Config::get('pga_config.airavata')['airavata-port']