Repository: airavata-php-gateway Updated Branches: refs/heads/master 2fa72cd78 -> ea100859f
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/master Commit: ea100859f7633546e3f60e4af5a7576eba3b0448 Parents: 2fa72cd Author: scnakandala <[email protected]> Authored: Thu Feb 11 11:01:19 2016 -0500 Committer: scnakandala <[email protected]> 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); }
