You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by nd...@apache.org on 2016/02/12 17:48:19 UTC
[1/3] airavata-php-gateway git commit: adding capacha verification
Repository: airavata-php-gateway
Updated Branches:
refs/heads/develop f9c936377 -> daf454ff2
adding capacha 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/2fa72cd7
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/2fa72cd7
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/2fa72cd7
Branch: refs/heads/develop
Commit: 2fa72cd7803efb863064c699016f5b8fc4f6f03b
Parents: e8ff249
Author: scnakandala <su...@gmail.com>
Authored: Thu Feb 11 09:40:19 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Feb 11 09:40:19 2016 -0500
----------------------------------------------------------------------
.../Wsis/Stubs/UserInformationRecoveryManager.php | 17 ++++++++++++++---
app/libraries/Wsis/Wsis.php | 12 ++++++++++--
2 files changed, 24 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fa72cd7/app/libraries/Wsis/Stubs/UserInformationRecoveryManager.php
----------------------------------------------------------------------
diff --git a/app/libraries/Wsis/Stubs/UserInformationRecoveryManager.php b/app/libraries/Wsis/Stubs/UserInformationRecoveryManager.php
index e03788d..49490aa 100755
--- a/app/libraries/Wsis/Stubs/UserInformationRecoveryManager.php
+++ b/app/libraries/Wsis/Stubs/UserInformationRecoveryManager.php
@@ -142,13 +142,24 @@ class UserInformationRecoveryManager {
* @param $userName
* @param $tenantDomain
*/
- public function confirmUserRegistration($userName, $code, $tenantDomain){
+ public function confirmUserRegistration($userAnswer, $imagePath, $secret, $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;
$result = $this->serviceStub->confirmUserSelfRegistration($confirmUserSelfRegistration);
- return $result->return->verified;
- return $result->return->verified;
+ return $result->return;
+ }
+
+ /**
+ * Public function to get Capatcha
+ * @return getCaptchaResponse
+ */
+ public function getCapatcha(){
+ return $this->serviceStub->getCaptcha(new getCaptcha());
}
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/2fa72cd7/app/libraries/Wsis/Wsis.php
----------------------------------------------------------------------
diff --git a/app/libraries/Wsis/Wsis.php b/app/libraries/Wsis/Wsis.php
index aa40bda..034da6d 100755
--- a/app/libraries/Wsis/Wsis.php
+++ b/app/libraries/Wsis/Wsis.php
@@ -444,8 +444,8 @@ class Wsis {
* @param $userName
* @param $tenantDomain
*/
- public function confirmUserRegistration($userName, $code, $tenantDomain){
- return $this->userInfoRecoveryManager->confirmUserRegistration($userName, $code, $tenantDomain);
+ public function confirmUserRegistration($userAnswer, $imagePath, $secret, $userName, $code, $tenantDomain){
+ return $this->userInfoRecoveryManager->confirmUserRegistration($userAnswer, $imagePath, $secret, $userName, $code, $tenantDomain);
}
/**
@@ -493,4 +493,12 @@ class Wsis {
public function resetPassword($username, $newPassword, $key){
return $this->userInfoRecoveryManager->resetPassword($username, $newPassword, $key);
}
+
+ /**
+ * Method to get a capatcha
+ * @return mixed
+ */
+ public function getCapatcha(){
+ return $this->userInfoRecoveryManager->getCapatcha();
+ }
}
\ No newline at end of file
[3/3] airavata-php-gateway git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/airavata-php-gateway into develop
Posted by nd...@apache.org.
Merge branch 'master' 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/daf454ff
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/daf454ff
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/daf454ff
Branch: refs/heads/develop
Commit: daf454ff2dc3e3c8f340af11e81b0c554a76a018
Parents: f9c9363 ea10085
Author: Nipurn Doshi <ni...@gmail.com>
Authored: Fri Feb 12 11:46:48 2016 -0500
Committer: Nipurn Doshi <ni...@gmail.com>
Committed: Fri Feb 12 11:46:48 2016 -0500
----------------------------------------------------------------------
app/config/pga_config.php.template | 6 +++---
.../Stubs/UserInformationRecoveryManager.php | 17 ++++++++++++++---
app/libraries/Wsis/Wsis.php | 20 +++++++++++++++-----
3 files changed, 32 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
[2/3] airavata-php-gateway git commit: defaulting the user roles to
Internal/everyone
Posted by nd...@apache.org.
defaulting the user roles to Internal/everyone
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/ea100859
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/ea100859
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/ea100859
Branch: refs/heads/develop
Commit: ea100859f7633546e3f60e4af5a7576eba3b0448
Parents: 2fa72cd
Author: scnakandala <su...@gmail.com>
Authored: Thu Feb 11 11:01:19 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Thu Feb 11 11:01:19 2016 -0500
----------------------------------------------------------------------
app/config/pga_config.php.template | 6 +++---
app/libraries/Wsis/Wsis.php | 8 +++++---
2 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ea100859/app/config/pga_config.php.template
----------------------------------------------------------------------
diff --git a/app/config/pga_config.php.template b/app/config/pga_config.php.template
index 84a354d..ccd85fb 100644
--- a/app/config/pga_config.php.template
+++ b/app/config/pga_config.php.template
@@ -11,17 +11,17 @@ return array(
/**
* Admin Role Name
*/
- 'admin-role-name' => 'admin',
+ 'admin-role-name' => 'Internal/everyone',
/**
* Read only Admin Role Name
*/
- 'read-only-admin-role-name' => 'admin-read-only',
+ 'read-only-admin-role-name' => 'Internal/everyone',
/**
* Gateway user role
*/
- 'user-role-name' => 'airavata-user',
+ 'user-role-name' => 'Internal/everyone',
/**
* Tenant Domain
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/ea100859/app/libraries/Wsis/Wsis.php
----------------------------------------------------------------------
diff --git a/app/libraries/Wsis/Wsis.php b/app/libraries/Wsis/Wsis.php
index 034da6d..0573dcd 100755
--- a/app/libraries/Wsis/Wsis.php
+++ b/app/libraries/Wsis/Wsis.php
@@ -290,8 +290,9 @@ class Wsis {
public function getAllRoles(){
try {
$roles = $this->userStoreManager->getRoleNames();
- return array_filter($roles, "Wsis::nonInternalRoles");
- var_dump($roles);exit;
+ return $roles;
+// return array_filter($roles, "Wsis::nonInternalRoles");
+// var_dump($roles);exit;
} catch (Exception $ex) {
throw new Exception("Unable to get all roles", 0, $ex);
}
@@ -309,7 +310,8 @@ class Wsis {
public function getUserRoles( $username){
try {
$roles = $this->userStoreManager->getRoleListOfUser( $username);
- return array_filter($roles, "Wsis::nonInternalRoles");
+ return $roles;
+// return array_filter($roles, "Wsis::nonInternalRoles");
} catch (Exception $ex) {
throw new Exception("Unable to get User roles.", 0, $ex);
}