airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndo...@apache.org
Subject [4/4] airavata-php-gateway git commit: Change of WSIS method to get user roles merge.
Date Wed, 16 Mar 2016 15:16:13 GMT
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/develop
Commit: 5e723741f95f81a68701c5aaa15add5182d516ff
Parents: 03af210 c20e676
Author: Nipurn Doshi <nipunhere@gmail.com>
Authored: Wed Mar 16 11:15:30 2016 -0400
Committer: Nipurn Doshi <nipunhere@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);


Mime
View raw message