You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2016/03/16 17:57:36 UTC
[01/11] airavata-php-gateway git commit: Temporary solution for
footer coming on top of things.
Repository: airavata-php-gateway
Updated Branches:
refs/heads/master fd9369ed2 -> 8ac405175
Temporary solution for footer coming on top of things.
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/a41fa621
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/a41fa621
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/a41fa621
Branch: refs/heads/master
Commit: a41fa621d20717282b2b995eba4c26b3fa6fa88f
Parents: f56256d
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Mar 11 13:34:36 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Mar 11 13:34:36 2016 -0500
----------------------------------------------------------------------
app/views/layout/basic.blade.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/a41fa621/app/views/layout/basic.blade.php
----------------------------------------------------------------------
diff --git a/app/views/layout/basic.blade.php b/app/views/layout/basic.blade.php
index ce52659..575eca4 100755
--- a/app/views/layout/basic.blade.php
+++ b/app/views/layout/basic.blade.php
@@ -83,7 +83,7 @@ var fullName = "{{Session::get("user-profile")["firstname"] . " " . Session::get
/* keeping a check that footer stays atleast at the bottom of the window.*/
var bh = $("html").height();
if( bh < $(window).height()){
- $(".theme-footer").css("position", "relative").css("top", $(window).height()/4);
+ $(".theme-footer").css("position", "relative").css("top", $(window).height()/4).css("z-index", "-1");
}
var bw = $("body").width();
if( bw > 767){
[03/11] airavata-php-gateway git commit: fixing role issue
Posted by sm...@apache.org.
fixing role 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/effe85ea
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/effe85ea
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/effe85ea
Branch: refs/heads/master
Commit: effe85ea298f20b314ed1187646a7ceef5bafbcb
Parents: 09a65f9
Author: scnakandala <su...@gmail.com>
Authored: Fri Mar 11 15:28:09 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Fri Mar 11 15:28:09 2016 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 3 ++-
app/controllers/AdminController.php | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/effe85ea/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 199c773..daeaa3c 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -123,7 +123,7 @@ class AccountController extends BaseController
$userProfile = WSIS::getUserProfileFromOAuthToken($accessToken);
$username = $userProfile['username'];
- $userRoles = (array)WSIS::getUserRoles($username);
+ $userRoles = $userProfile['roles'];
print_r( $userRoles);
$authzToken = new Airavata\Model\Security\AuthzToken();
@@ -133,6 +133,7 @@ class AccountController extends BaseController
Session::put('oauth-refresh-code',$refreshToken);
Session::put('oauth-expiration-time',$expirationTime);
Session::put("user-profile", $userProfile);
+ Session::put("roles", $userRoles);
if (in_array(Config::get('pga_config.wsis')['admin-role-name'], $userRoles)) {
Session::put("admin", true);
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/effe85ea/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index a014a88..e570834 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -130,7 +130,7 @@ class AdminController extends BaseController {
}
public function addRolesToUser(){
- $currentRoles = (array)WSIS::getUserRoles(Input::get("username"));
+ $currentRoles = Session::get('roles');
$roles["new"] = array_diff(Input::all()["roles"], $currentRoles);
$roles["deleted"] = array_diff($currentRoles, Input::all()["roles"]);
@@ -158,7 +158,7 @@ class AdminController extends BaseController {
}
public function getRoles(){
- return json_encode((array)WSIS::getUserRoles(Input::get("username")));
+ return json_encode(Session::get("roles"));
}
public function deleteRole(){
[06/11] airavata-php-gateway git commit: removing ssh username from
input path
Posted by sm...@apache.org.
removing ssh username from input path
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/2af83ea9
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2af83ea9
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2af83ea9
Branch: refs/heads/master
Commit: 2af83ea9b283c3f43e0053ee3cf1363c03ce5134
Parents: b4a827e
Author: scnakandala <su...@gmail.com>
Authored: Tue Mar 15 15:50:32 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Mar 15 15:50:32 2016 -0400
----------------------------------------------------------------------
app/config/pga_config.php.template | 5 -----
app/libraries/ExperimentUtilities.php | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2af83ea9/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index 411a6d7..fe8316f 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -114,11 +114,6 @@ return array(
'experiment-data-absolute-path' => '/var/www/experimentData',
/**
- * username for the user for accessing the experiment data over ssh
- */
- 'ssh-user' => 'root',
-
- /**
* Advanced experiments options
*/
'advanced-experiment-options' => '',
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2af83ea9/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index 6b5016c..faca1f9 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -318,7 +318,7 @@ class ExperimentUtilities
$experimentAssemblySuccessful = false;
}
$hostName = $_SERVER['SERVER_NAME'];
- $experimentInput->value = 'file://' . Config::get('pga_config.airavata')['ssh-user'] . '@' . $hostName . ':' . $filePath;
+ $experimentInput->value = 'file://' . $hostName . ':' . $filePath;
$experimentInput->type = $applicationInput->type;
} else {
[08/11] airavata-php-gateway git commit: sending access granted email
to the user
Posted by sm...@apache.org.
sending access granted email to the user
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/c20e676c
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/c20e676c
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/c20e676c
Branch: refs/heads/master
Commit: c20e676c011eb4b8e0560143527434ec71ee9c3a
Parents: 5847c98
Author: scnakandala <su...@gmail.com>
Authored: Wed Mar 16 10:51:35 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Wed Mar 16 10:51:35 2016 -0400
----------------------------------------------------------------------
app/controllers/AdminController.php | 53 ++++++++++++++++++++++++++++++--
1 file changed, 51 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/c20e676c/app/controllers/AdminController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AdminController.php b/app/controllers/AdminController.php
index e570834..b871558 100644
--- a/app/controllers/AdminController.php
+++ b/app/controllers/AdminController.php
@@ -175,12 +175,61 @@ class AdminController extends BaseController {
}
public function updateUserRoles(){
- if( Input::has("add"))
- return WSIS::updateUserRoles(Input::get("username"), array("new"=> Input::get("roles"), "deleted" => array() ) );
+ if( Input::has("add")){
+ WSIS::updateUserRoles(Input::get("username"), array("new"=> Input::get("roles"), "deleted" => array() ) );
+ if(in_array(Config::get(wsis::admin-role-name), Input::get("roles")) || in_array(Config::get(wsis::read-only-admin-role-name), Input::get("roles"))
+ || in_array(Config::get(wsis::user-role-name), Input::get("roles"))){
+ $this->sendAccessGrantedEmailToTheUser(Input::get("username"));
+ }
+ }
else
return WSIS::updateUserRoles(Input::get("username"), array("new"=> array(), "deleted" => Input::get("roles") ) );
}
+ private function sendAccessGrantedEmailToTheUser($username){
+
+ $mail = new PHPMailer;
+
+ $mail->isSMTP();
+ $mail->SMTPDebug = 3;
+ $mail->Host = Config::get('pga_config.portal')['portal-smtp-server-host'];
+
+ $mail->SMTPAuth = true;
+
+ $mail->Username = Config::get('pga_config.portal')['portal-email-username'];
+ $mail->Password = Config::get('pga_config.portal')['portal-email-password'];
+
+ $mail->SMTPSecure = "tls";
+ $mail->Port = intval(Config::get('pga_config.portal')['portal-smtp-server-port']);
+
+ $mail->From = Config::get('pga_config.portal')['portal-email-username'];
+ $mail->FromName = "Gateway Portal: " . $_SERVER['SERVER_NAME'];
+
+ $recipients = Config::get('pga_config.portal')['admin-emails'];
+ foreach($recipients as $recipient){
+ $mail->addAddress($recipient);
+ }
+
+ $mail->isHTML(true);
+
+ $mail->Subject = "Your user account (".$username.") was authorized !";
+ $userProfile = WSIS::getUserProfile($username);
+ $wsisConfig = Config::get('pga_config.wsis');
+ if( $wsisConfig['tenant-domain'] == "")
+ $username = $username;
+ else
+ $username = $username . "@" . $wsisConfig['tenant-domain'];
+
+ $str = "Please relogin into the portal to access the portal features" ."<br/><br/>";
+ $str = $str . "Gateway Portal: " . $_SERVER['SERVER_NAME'] ."<br/>";
+ $str = $str . "Username: " . $username ."<br/>";
+ $str = $str . "Name: " . $userProfile["firstname"] . " " . $userProfile["lastname"] . "<br/>";
+ $str = $str . "Email: " . $userProfile["email"] ;
+
+ $mail->Body = $str;
+ $mail->send();
+ }
+
public function experimentStatistics()
{
if (Request::ajax()) {
[07/11] airavata-php-gateway git commit: sending experimentDataDir
full path in the experiment config
Posted by sm...@apache.org.
sending experimentDataDir full path in the experiment config
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/5847c98d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/5847c98d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/5847c98d
Branch: refs/heads/master
Commit: 5847c98d714745da3b89eb83db4982581c6260f1
Parents: 2af83ea
Author: scnakandala <su...@gmail.com>
Authored: Tue Mar 15 15:54:19 2016 -0400
Committer: scnakandala <su...@gmail.com>
Committed: Tue Mar 15 15:54:19 2016 -0400
----------------------------------------------------------------------
app/libraries/ExperimentUtilities.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5847c98d/app/libraries/ExperimentUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/ExperimentUtilities.php b/app/libraries/ExperimentUtilities.php
index faca1f9..0831fba 100644
--- a/app/libraries/ExperimentUtilities.php
+++ b/app/libraries/ExperimentUtilities.php
@@ -189,7 +189,7 @@ class ExperimentUtilities
if (ExperimentUtilities::$experimentPath == null) {
ExperimentUtilities::create_experiment_folder_path($_POST['project'], $_POST['experiment-name']);
}
- $userConfigData->experimentDataDir = ExperimentUtilities::$relativeExperimentDataDir;
+ $userConfigData->experimentDataDir = ExperimentUtilities::$experimentPath;
$experiment = new ExperimentModel();
// required
[05/11] airavata-php-gateway git commit: disabling captcha
verification
Posted by sm...@apache.org.
disabling captcha verification
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/b4a827e9
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b4a827e9
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b4a827e9
Branch: refs/heads/master
Commit: b4a827e9e2eba886e9f87ffb2a3989f4d015a724
Parents: 38738a2
Author: scnakandala <su...@gmail.com>
Authored: Fri Mar 11 15:39:32 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Fri Mar 11 15:39:32 2016 -0500
----------------------------------------------------------------------
app/controllers/AccountController.php | 34 +++++++++-----------
.../Stubs/UserInformationRecoveryManager.php | 8 ++---
app/libraries/Wsis/Wsis.php | 4 +--
app/views/account/forgot-password.blade.php | 34 +++++++-------------
4 files changed, 34 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b4a827e9/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index daeaa3c..536ed5c 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -243,9 +243,8 @@ class AccountController extends BaseController
public function forgotPassword()
{
- $capatcha = WSIS::getCapatcha()->return;
- return View::make("account/forgot-password", array("imagePath"=>$capatcha->imagePath, "secretKey"=>$capatcha->secretKey,
- "imageUrl"=> Config::get("pga_config.wsis")["service-url"] . $capatcha->imagePath));
+// $capatcha = WSIS::getCapatcha()->return;
+ return View::make("account/forgot-password");
}
public function forgotPasswordSubmit()
@@ -316,28 +315,27 @@ class AccountController extends BaseController
return View::make("home");
}else{
try{
- if(Input::has("userAnswer")){
- $result = WSIS::confirmUserRegistration(Input::get("userAnswer"),Input::get("imagePath"),
- Input::get("secretKey"), $username, $confirmation, Config::get('pga_config.wsis')['tenant-domain']);
+// if(Input::has("userAnswer")){
+ $result = WSIS::confirmUserRegistration($username, $confirmation, Config::get('pga_config.wsis')['tenant-domain']);
if($result->verified){
$this->sendAccountCreationNotification2Admin($username);
return Redirect::to("login");
- }else if(!$result->verified && preg_match('/Error while validating captcha for user/',$result->error) ){
- CommonUtilities::print_error_message("Captcha Verification failed!");
- $capatcha = WSIS::getCapatcha()->return;
- return View::make("account/verify-human", array("username"=>$username,"code"=>$confirmation,
- "imagePath"=>$capatcha->imagePath, "secretKey"=>$capatcha->secretKey,
- "imageUrl"=> Config::get("pga_config.wsis")["service-url"] . $capatcha->imagePath));
+// }else if(!$result->verified && preg_match('/Error while validating captcha for user/',$result->error) ){
+// CommonUtilities::print_error_message("Captcha Verification failed!");
+// $capatcha = WSIS::getCapatcha()->return;
+// return View::make("account/verify-human", array("username"=>$username,"code"=>$confirmation,
+// "imagePath"=>$capatcha->imagePath, "secretKey"=>$capatcha->secretKey,
+// "imageUrl"=> Config::get("pga_config.wsis")["service-url"] . $capatcha->imagePath));
}else{
CommonUtilities::print_error_message("Account confirmation failed!");
return View::make("home");
}
- }else{
- $capatcha = WSIS::getCapatcha()->return;
- return View::make("account/verify-human", array("username"=>$username,"code"=>$confirmation,
- "imagePath"=>$capatcha->imagePath, "secretKey"=>$capatcha->secretKey,
- "imageUrl"=> Config::get("pga_config.wsis")["service-url"] . $capatcha->imagePath));
- }
+// }else{
+// $capatcha = WSIS::getCapatcha()->return;
+// return View::make("account/verify-human", array("username"=>$username,"code"=>$confirmation,
+// "imagePath"=>$capatcha->imagePath, "secretKey"=>$capatcha->secretKey,
+// "imageUrl"=> Config::get("pga_config.wsis")["service-url"] . $capatcha->imagePath));
+// }
}catch (Exception $e){
CommonUtilities::print_error_message("Account confirmation failed!");
return View::make("home");
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b4a827e9/app/libraries/Wsis/Stubs/UserInformationRecoveryManager.php
----------------------------------------------------------------------
diff --git a/app/libraries/Wsis/Stubs/UserInformationRecoveryManager.php b/app/libraries/Wsis/Stubs/UserInformationRecoveryManager.php
index f5535e1..e62306c 100755
--- a/app/libraries/Wsis/Stubs/UserInformationRecoveryManager.php
+++ b/app/libraries/Wsis/Stubs/UserInformationRecoveryManager.php
@@ -147,15 +147,15 @@ class UserInformationRecoveryManager {
* @param $userName
* @param $tenantDomain
*/
- public function confirmUserRegistration($userAnswer, $imagePath, $secret, $userName, $code, $tenantDomain){
+ public function confirmUserRegistration($userName, $code, $tenantDomain){
$confirmUserSelfRegistration = new confirmUserSelfRegistration();
$confirmUserSelfRegistration->username = $userName;
$confirmUserSelfRegistration->code = $code;
$confirmUserSelfRegistration->tenantDomain = $tenantDomain;
$confirmUserSelfRegistration->captcha = new CaptchaInfoBean();
- $confirmUserSelfRegistration->captcha->userAnswer = $userAnswer;
- $confirmUserSelfRegistration->captcha->imagePath = $imagePath;
- $confirmUserSelfRegistration->captcha->secretKey = $secret;
+// $confirmUserSelfRegistration->captcha->userAnswer = $userAnswer;
+// $confirmUserSelfRegistration->captcha->imagePath = $imagePath;
+// $confirmUserSelfRegistration->captcha->secretKey = $secret;
$result = $this->serviceStub->confirmUserSelfRegistration($confirmUserSelfRegistration);
return $result->return;
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b4a827e9/app/libraries/Wsis/Wsis.php
----------------------------------------------------------------------
diff --git a/app/libraries/Wsis/Wsis.php b/app/libraries/Wsis/Wsis.php
index faba4e1..1a69e91 100755
--- a/app/libraries/Wsis/Wsis.php
+++ b/app/libraries/Wsis/Wsis.php
@@ -446,8 +446,8 @@ class Wsis {
* @param $userName
* @param $tenantDomain
*/
- public function confirmUserRegistration($userAnswer, $imagePath, $secret, $userName, $code, $tenantDomain){
- return $this->userInfoRecoveryManager->confirmUserRegistration($userAnswer, $imagePath, $secret, $userName, $code, $tenantDomain);
+ public function confirmUserRegistration($userName, $code, $tenantDomain){
+ return $this->userInfoRecoveryManager->confirmUserRegistration($userName, $code, $tenantDomain);
}
/**
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b4a827e9/app/views/account/forgot-password.blade.php
----------------------------------------------------------------------
diff --git a/app/views/account/forgot-password.blade.php b/app/views/account/forgot-password.blade.php
index f0fbfc4..2fa2883 100644
--- a/app/views/account/forgot-password.blade.php
+++ b/app/views/account/forgot-password.blade.php
@@ -1,31 +1,21 @@
@extends('layout.basic')
@section('page-header')
-@parent
+ @parent
@stop
@section('content')
-<div class="col-md-offset-3 col-md-6">
+ <div class="col-md-offset-3 col-md-6">
- <h3> Did you forget the password to your account? </h3>
- <h4> Please enter your username, you registered with.</h4>
- <form role="form" method="POST" action="{{ URL::to('/') }}/forgot-password">
- <div class="form-group form-horizontal">
- <img src="{{$imageUrl}}"/>
- <div>
- <input name="imagePath" type="hidden" value="{{$imagePath}}" class="form-control"/>
- <input name="secretKey" type="hidden" value="{{$secretKey}}" class="form-control"/>
- <br/>
- <input class="form-control" id="userAnswer" name="userAnswer" placeholder="captcha text" required="required"/>
- <br/>
- <input name="username" type="username" value="" class="form-control" placeholder="username" required/>
+ <h3> Did you forget the password to your account? </h3>
+ <h4> Please enter your username, you registered with.</h4>
+ <form role="form" method="POST" action="{{ URL::to('/') }}/forgot-password">
+ <div class="form-group form-horizontal">
+ <div class="col-md-8"><input name="username" type="username" value="" class="form-control" placeholder="username" required/></div>
+ <div class="col-md-2"><input type="submit" class="form-control btn btn-primary" value="Submit"/></div>
</div>
- </div>
- <div class="form-group btn-toolbar">
- <div class="btn-group">
- <input type="submit" class="form-control btn btn-primary" value="Submit"/>
- </div>
- </div>
- </form>
- @stop
\ No newline at end of file
+ </form>
+ </div>
+
+@stop
\ No newline at end of file
[04/11] airavata-php-gateway git commit: Merge remote-tracking branch
'origin/develop' into develop
Posted by sm...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
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/38738a2d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/38738a2d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/38738a2d
Branch: refs/heads/master
Commit: 38738a2d136c8c1c481db0b4d93ea4db28741c11
Parents: effe85e fd9369e
Author: scnakandala <su...@gmail.com>
Authored: Fri Mar 11 15:28:18 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Fri Mar 11 15:28:18 2016 -0500
----------------------------------------------------------------------
app/libraries/Airavata/API/Airavata.php | 387 +++++++++++++++++++
.../Model/AppCatalog/GatewayProfile/Types.php | 23 ++
2 files changed, 410 insertions(+)
----------------------------------------------------------------------
[09/11] airavata-php-gateway git commit: Getting new user redirects
back.
Posted by sm...@apache.org.
Getting new user redirects back.
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/03af210d
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/03af210d
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/03af210d
Branch: refs/heads/master
Commit: 03af210df59b14c84c23079b788718becceb3f82
Parents: 4ea219d
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Wed Mar 16 11:12:16 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Wed Mar 16 11:12:16 2016 -0400
----------------------------------------------------------------------
app/controllers/AccountController.php | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/03af210d/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --git a/app/controllers/AccountController.php b/app/controllers/AccountController.php
index 199c773..523ab7d 100755
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@ -124,8 +124,7 @@ class AccountController extends BaseController
$userProfile = WSIS::getUserProfileFromOAuthToken($accessToken);
$username = $userProfile['username'];
$userRoles = (array)WSIS::getUserRoles($username);
-
- print_r( $userRoles);
+
$authzToken = new Airavata\Model\Security\AuthzToken();
$authzToken->accessToken = $accessToken;
$authzToken->claimsMap = array('userName'=>$username);
@@ -133,6 +132,7 @@ class AccountController extends BaseController
Session::put('oauth-refresh-code',$refreshToken);
Session::put('oauth-expiration-time',$expirationTime);
Session::put("user-profile", $userProfile);
+
if (in_array(Config::get('pga_config.wsis')['admin-role-name'], $userRoles)) {
Session::put("admin", true);
}
@@ -158,7 +158,7 @@ class AccountController extends BaseController
if(Session::get("admin") || Session::get("admin-read-only")){
return Redirect::to("admin/dashboard");
}else{
- return Redirect::to("home");
+ return Redirect::to("account/dashboard");
}
}
@@ -281,6 +281,10 @@ class AccountController extends BaseController
}
}
+ public function dashboard(){
+ return View::make("account/dashboard");
+ }
+
public function resetPassword()
{
$confirmation = Input::get("confirmation");
[11/11] airavata-php-gateway git commit: Fixing Storage UI Access
issues
Posted by sm...@apache.org.
Fixing Storage UI Access issues
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/8ac40517
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/8ac40517
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/8ac40517
Branch: refs/heads/master
Commit: 8ac405175f670fb7b19687494e94fee0549cb703
Parents: 5e72374
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Wed Mar 16 12:39:53 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Wed Mar 16 12:39:53 2016 -0400
----------------------------------------------------------------------
app/libraries/CommonUtilities.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/8ac40517/app/libraries/CommonUtilities.php
----------------------------------------------------------------------
diff --git a/app/libraries/CommonUtilities.php b/app/libraries/CommonUtilities.php
index 2dcddd8..92a8d31 100644
--- a/app/libraries/CommonUtilities.php
+++ b/app/libraries/CommonUtilities.php
@@ -194,7 +194,8 @@ class CommonUtilities
}
$active = "";
- if( Session::has("nav-active") && Session::has('loggedin') ){
+ if(Session::has('loggedin') && (Session::has('authorized-user') || Session::has('admin')
+ || Session::has('admin-read-only'))){
if( Session::get("nav-active") == "storage")
$active = "active";
echo '<li class="' . $active . '"><a href="' . URL::to("/") . '/files/browse"><span class="glyphicon glyphicon-folder-close"></span> Storage</a></li>';
[10/11] airavata-php-gateway git commit: Change of WSIS method to get
user roles merge.
Posted by sm...@apache.org.
Change of WSIS method to get user roles merge.
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/5e723741
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/5e723741
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/5e723741
Branch: refs/heads/master
Commit: 5e723741f95f81a68701c5aaa15add5182d516ff
Parents: 03af210 c20e676
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Wed Mar 16 11:15:30 2016 -0400
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Wed Mar 16 11:15:30 2016 -0400
----------------------------------------------------------------------
app/config/pga_config.php.template | 5 --
app/controllers/AccountController.php | 40 +++++++-------
app/controllers/AdminController.php | 57 ++++++++++++++++++--
app/libraries/ExperimentUtilities.php | 4 +-
.../Stubs/UserInformationRecoveryManager.php | 8 +--
app/libraries/Wsis/Wsis.php | 4 +-
app/views/account/forgot-password.blade.php | 34 +++++-------
7 files changed, 92 insertions(+), 60 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/5e723741/app/controllers/AccountController.php
----------------------------------------------------------------------
diff --cc app/controllers/AccountController.php
index 523ab7d,536ed5c..f302663
mode 100755,100755..100644
--- a/app/controllers/AccountController.php
+++ b/app/controllers/AccountController.php
@@@ -123,8 -123,9 +123,8 @@@ class AccountController extends BaseCon
$userProfile = WSIS::getUserProfileFromOAuthToken($accessToken);
$username = $userProfile['username'];
- $userRoles = (array)WSIS::getUserRoles($username);
-
+ $userRoles = $userProfile['roles'];
+
- print_r( $userRoles);
$authzToken = new Airavata\Model\Security\AuthzToken();
$authzToken->accessToken = $accessToken;
$authzToken->claimsMap = array('userName'=>$username);
[02/11] airavata-php-gateway git commit: Merge branch 'develop' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by sm...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
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/4ea219d8
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/4ea219d8
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/4ea219d8
Branch: refs/heads/master
Commit: 4ea219d809d7a657c0854233555464b346ffcd93
Parents: a41fa62 fd9369e
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Mar 11 13:34:51 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Mar 11 13:34:51 2016 -0500
----------------------------------------------------------------------
app/config/pga_config.php.template | 6 +-
app/controllers/AccountController.php | 38 +-
app/libraries/Airavata/API/Airavata.php | 387 +++++++++++++++++++
.../Model/AppCatalog/GatewayProfile/Types.php | 23 ++
.../Stubs/UserInformationRecoveryManager.php | 7 +-
app/libraries/Wsis/Wsis.php | 4 +-
app/views/account/forgot-password.blade.php | 16 +-
app/views/account/verify-human.blade.php | 12 +-
8 files changed, 448 insertions(+), 45 deletions(-)
----------------------------------------------------------------------